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
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
post_migrate
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
seeds.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00