]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Thu, 11 Mar 2021 15:08:15 +0000 (16:08 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Thu, 11 Mar 2021 15:08:15 +0000 (16:08 +0100)
commit1b6a21e6bc7ec9c0d5bb3daf2646d003ba90404c
tree656d328e630e1a4fa11e9853203f4dba8e29cb71
parent318efa49de8d0b9615427c99ab07c591230dfd80
parentf2ca6c7a172deb9309c793adb87cdc4b46974a44
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/validators/status_length_validator.rb`:
  Conflict due to glitch-soc's configurable maximum toot chars.
  Ported upstream changes.
Gemfile
Gemfile.lock
app/validators/status_length_validator.rb
app/views/admin/action_logs/index.html.haml
package.json
yarn.lock