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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
development.js	Add OCR tool to media editing modal (#11566)	2019-08-15 15:13:26 +02:00
generateLocalePacks.js	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
production.js	Replace from uglifyjs to terser (#10956)	2019-06-04 14:17:09 +02:00
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
test.js	Upgrade webpack to version v4.x (#6655)	2018-07-14 03:56:41 +02:00
translationRunner.js	Upgrade yargs to v12.0 (#9862)	2019-03-15 03:53:38 +01:00