Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +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-08-19 21:49:35 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00