treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/javascript/core
History
Thibaut Girka 1159490f00 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
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
common.js Avoid loading rails-ujs twice on vanilla flavour 2018-07-16 16:42:52 +02:00
embed.js
…
mailer.js
…
public.js Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
settings.js Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
theme.yml
…