Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
seeds.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00