mastodon/app/javascript/core
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
..
admin.js Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
common.js
embed.js
mailer.js Fixed improper mailer import 2018-01-15 21:23:26 -08:00
public.js
settings.js Moved flavour UI into own prefs tab 2017-12-10 20:32:27 -08:00
theme.yml Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00