mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-24 06:58:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/settings/preferences
History
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
..
show.html.haml Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05:00