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
..
_login.html.haml	Redesign landing page (#10232)	2019-03-12 17:34:00 +01:00
_registration.html.haml	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
show.html.haml	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +02:00
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00