mastodon/lib
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
..
assets
devise Fix wrong string being used on login failure when using LDAP (#8534) 2018-09-01 03:35:37 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
paperclip Unconditionally re-encode locally-uploaded images to strip metadata 2018-09-17 21:09:59 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
cli.rb Move more tasks to tootctl (#8675) 2018-09-14 17:42:22 +02:00