mirror of https://github.com/tootsuite/mastodon
1682ac5717
Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there. |
||
|---|---|---|
| .. | ||
| admin.js | ||
| common.js | ||
| embed.js | ||
| mailer.js | ||
| public.js | ||
| settings.js | ||
| theme.yml | ||