masto-fe/app/views/admin/pending_accounts
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
_account.html.haml Add "why do you want to join" field to invite requests (#10524) 2019-04-09 23:06:30 +09:00
index.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00