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
..
applications	Add label for application scopes (#4691)	2017-08-25 13:03:26 +02:00
deletes	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00
exports	Settings export refactor (#1646)	2017-04-13 13:02:02 +02:00
follower_domains	Followers-only post federation (#2111)	2017-04-24 00:38:37 +02:00
imports	Optimize user setting page for mobile browser (#1924)	2017-04-17 10:37:00 +02:00
preferences	Add unfollow modal (optional) (#4246)	2017-07-18 17:14:43 +02:00
profiles	Merge that good fresh upstream shit	2017-07-22 01:16:53 +00:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00
two_factor_authentications	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00