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 | ||