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
..
2019-04-08 21:14:08 +09:00
2019-04-03 18:19:10 +09:00
2019-03-29 22:04:55 +09:00
2019-04-08 12:35:37 +09:00
2019-04-05 06:12:08 +09:00
2019-04-09 07:39:50 +09:00
2019-04-03 07:24:39 +09:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00