694c073d1f
Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. |
||
---|---|---|
.. | ||
admin.js | ||
auth.js | ||
common.js | ||
embed.js | ||
mailer.js | ||
public.js | ||
settings.js | ||
theme.yml | ||
two_factor_authentication.js |