fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 11:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/admin/domain_blocks
History
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +02:00
..
_domain_block.html.haml Add admin area view partials for each record type (#2700) 2017-05-02 20:56:28 +02:00
index.html.haml Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
new.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
show.html.haml Allow domain blocks that only reject media without silencing or suspending (#4325) 2017-07-24 14:26:55 +02:00