Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock		2019-07-30 12:22:33 +02:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
post_migrate	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +02:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00