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

..

admin.html.haml

New logo (#4306)

2017-07-23 02:40:39 +02:00

application.html.haml

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

auth.html.haml

New logo (#4306)

2017-07-23 02:40:39 +02:00

embedded.html.haml

Add option to opt out of search engines on public profile/status pages (#4199)

2017-07-14 16:41:02 +02:00

error.html.haml

Added haml-lint and fix warnings (#2773)

2017-05-08 03:35:25 +02:00

mailer.text.erb

Instance helper to replace site title helper (#2038)

2017-04-18 00:16:32 +02:00

modal.html.haml

Add "signed in as" header to some pages (#4523)

2017-08-05 04:24:58 +02:00

public.html.haml

Link to /about from public page on a single user instance (#3814)

2017-06-19 11:32:28 +02:00