masto-fe/app/views/layouts
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
..
_theme.html.haml Various fixes 2017-12-04 21:58:10 -08:00
admin.html.haml Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
application.html.haml Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-11 09:17:21 +00:00
auth.html.haml Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
embedded.html.haml Minor fixes 2017-11-21 18:17:38 -08:00
error.html.haml Hardcode default skin/theme in error layout (fixes #373) 2018-05-31 14:38:48 +02:00
mailer.html.haml Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06:00
mailer.text.erb Replace tutorial modal with welcome e-mail (#6273) 2018-01-18 19:17:25 +01:00
modal.html.haml Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
plain_mailer.html.haml HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
public.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00