luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-03 03:53:43 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
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
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
flavours Fix thread CW expansion not being reset when changing threads 2018-09-16 12:41:20 +02:00
fonts
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00