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
..
applications	…
deletes	…
exports	…
featured_tags	Add explanation to featured hashtags page and profile (#11586)	2019-08-17 18:07:52 +02:00
flavours	…
identity_proofs	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
imports	…
migrations	…
preferences	Add option to disable emoji replacements	2019-08-12 23:01:37 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
shared	…
two_factor_authentication	…
two_factor_authentications	…