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
..
chewy	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
mailers	Fix error in AdminMailer#new_pending_account (#10264)	2019-03-14 14:20:22 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00