mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 20:33:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/views/settings/preferences/appearance
History
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00