| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-06-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-06-10 | Fix can't save preference other (#11042) | ふるふる | |
| 2019-06-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 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-07 | Change /settings/preferences to redirect to appearance, add ↵ | Eugen Rochko | |
| /settings/preferences/other (#10988) | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |