diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
| commit | 392ca0472a50ea930f46e22dccf5ce55b04ef588 (patch) | |
| tree | 9f8c6b3dcb11a620a417205f9554e8d37e5f3e12 /spec/rails_helper.rb | |
| parent | 252deefe3433d0cedafd973becd0d85b5182eb49 (diff) | |
| parent | 33f3818d660c67194f94c7ff2bb180f4865e6748 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.
Diffstat (limited to 'spec/rails_helper.rb')
0 files changed, 0 insertions, 0 deletions