• Thibaut Girka's avatar
    Merge branch 'master' into glitch-soc/merge-upstream · 5085559b
    Thibaut Girka authored
    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.
    5085559b
Name
Last commit
Last update
..
migrate Loading commit data...
post_migrate Loading commit data...
schema.rb Loading commit data...
seeds.rb Loading commit data...