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
..
_bio.html.haml	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
_header.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
_moved.html.haml	Add rel=me to moved accounts' link (#8742)	2018-09-20 22:53:30 +02:00
_og.html.haml	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
show.html.haml	Improve light theme (#10992)	2019-06-08 10:23:41 +02:00