mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 06:35:08 +01:00
b2526316f5
Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system. |
||
---|---|---|
.. | ||
about.js | ||
admin.js | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.js | ||
share.js |