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
..
rules	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-24 16:23:53 +02:00
configuration.js
development.js	Add OCR tool to media editing modal (#11566)	2019-08-15 15:13:26 +02:00
generateLocalePacks.js
production.js
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
test.js
translationRunner.js