Thibaut Girka 654fd69903 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.		2020-07-15 15:32:40 +02:00
..
development.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
production.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
test.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00