diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-11 16:08:15 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-11 16:08:15 +0100 |
| commit | 1b6a21e6bc7ec9c0d5bb3daf2646d003ba90404c (patch) | |
| tree | 656d328e630e1a4fa11e9853203f4dba8e29cb71 /app/javascript/flavours/glitch/features/local_settings/page | |
| parent | 318efa49de8d0b9615427c99ab07c591230dfd80 (diff) | |
| parent | f2ca6c7a172deb9309c793adb87cdc4b46974a44 (diff) | |
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.
Diffstat (limited to 'app/javascript/flavours/glitch/features/local_settings/page')
0 files changed, 0 insertions, 0 deletions