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
..
_contact.html.haml_spec.rb	Redesign /terms page (#4338)	2017-07-24 17:15:15 +02:00
show.html.haml_spec.rb	Merge branch 'origin/master' into sync/upstream	2017-09-09 14:27:47 -05:00