Alex Gleason c3112fd13a Merge remote-tracking branch 'upstream/develop' into registration-workflow		2020-10-13 19:20:00 -05:00
..
controllers	alias alphabetically order	2020-10-13 16:43:59 +03:00
views	Preload `/api/pleroma/frontend_configurations`, fixes #1932	2020-10-12 18:49:37 -05:00
controller.ex	Merge remote-tracking branch 'upstream/develop' into registration-workflow	2020-10-13 19:20:00 -05:00
twitter_api.ex	Move admin approval email logic into User.post_register_action/1	2020-10-11 21:46:10 -05:00