mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-01 03:19:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/settings/preferences
History
Thibaut Girka 20d01a954e 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

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
..
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00