nyastodon/app
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
..
controllers Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
helpers Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
javascript Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
lib Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
mailers Set default From address in config (#3756) 2017-07-07 00:12:12 +02:00
models Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
policies Add status destroy authorization to policy (#3453) 2017-05-30 22:56:31 +02:00
presenters Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
serializers Rename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779) 2017-09-02 23:13:35 +02:00
services Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
validators Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
views Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
workers Forward ActivityPub creates that reply to local statuses (#4709) 2017-08-30 15:37:02 +02:00