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

5.2 KiB

Raw Blame History

View Raw