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
..
v1	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05:00
web	Embed modal (#4748)	2017-08-31 03:38:35 +02:00
base_controller.rb	Don't send Link header when don't know prev and next links (#4633)	2017-08-18 10:42:59 +02:00
oembed_controller.rb	Update status embeds (#4742)	2017-08-30 10:23:43 +02:00
push_controller.rb	Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)	2017-07-14 23:01:20 +02:00
salmon_controller.rb	Clean up for api/base controller (#3629)	2017-06-07 20:09:25 +02:00
subscriptions_controller.rb	HTTP signatures (#4146)	2017-07-14 20:41:49 +02:00