catstodon/app/views/stream_entries
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
..
_detailed_status.html.haml Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
_og_description.html.haml Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) 2018-03-18 20:33:07 +01:00
_og_image.html.haml Add admin setting to enable OG previews for sensitive media (#7962) 2018-07-06 02:15:56 +02:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
_status.html.haml Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
embed.html.haml Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
show.html.haml Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00