diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-09-30 00:01:20 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-09-30 00:01:20 +0200 |
| commit | 29b5c5f4830f9bda0af352b1d6ac73830a6cfd4e (patch) | |
| tree | 899cb5f54098d08f28dad2c8ee555b3557dead16 /spec/controllers | |
| parent | 00889b313176308018d66e54b5cb7dcc92da1587 (diff) | |
| parent | fc3ae1343df5adb83a3733958a4436981feb380f (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/custom_emoji.rb`: Slight refactor upstream, next to a line that was different in glitch-soc because of our local configurable limits on custom emoji size. Ported upstream changes. - `yarn.lock`: Not really a conflict, upstream dependency textually too close to a glitch-soc-only dependency. Updated upstream dependency as upstream.
Diffstat (limited to 'spec/controllers')
0 files changed, 0 insertions, 0 deletions