mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2025-01-08 04:36:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/views/settings/preferences
History
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
show.html.haml Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00