mastodon/app
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
..
controllers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
helpers
javascript Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
lib Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
mailers
models Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
policies
presenters
serializers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
services
validators
views Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
workers