mastodon/app
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
..
chewy
controllers Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
helpers Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
javascript Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
lib Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
mailers
models Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
policies Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
presenters Add backend support for bookmarks 2018-04-11 20:40:29 +02:00
serializers Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
services Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
validators Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
views Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
workers Fixes/do not override timestamps (#7331) 2018-05-03 13:33:08 +02:00