mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-29 21:49:09 +00:00
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. |
||
---|---|---|
.. | ||
authorizations_controller.rb | ||
authorized_applications_controller.rb | ||
tokens_controller.rb |