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
..
frontends	Multiple frontend support (#110)	2017-07-30 19:28:21 +02:00
about.js	Require any modules after loading polyfill in entry points (#4231)	2017-07-18 00:19:02 +02:00
admin.js	Improve admin page (#4121)	2017-07-18 16:38:22 +02:00
application.js	Multiple frontend support (#110)	2017-07-30 19:28:21 +02:00
common.js	Multiple frontend support (#110)	2017-07-30 19:28:21 +02:00
custom.js	adding cybre changes	2017-06-23 21:45:14 +00:00
public.js	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05:00
share.js	Add protocol handler. Handle follow intents (#4511)	2017-08-14 04:53:31 +02:00