Commit Graph

4 Commits

Author SHA1 Message Date
Thibaut Girka 7778de467c Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00
ふるふる 62852252dd Fix can't save preference other (#11042) 2019-06-10 19:26:43 +02:00
Thibaut Girka 1b0ff4cd69 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
Eugen Rochko 560ec24e58
Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00