Thibaut Girka 5a158899bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
flavours	Minor cleanup	2019-06-10 16:24:09 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
packs	Put poll options behind content warnings (#10983)	2019-06-08 17:40:59 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00