1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
YuruToot/lib/mastodon
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
..
accounts_cli.rb Move more tasks to tootctl (#8675) 2018-09-14 17:42:22 +02:00
cli_helper.rb tootctl accounts [add|del|cull] (#8642) 2018-09-09 13:33:36 +02:00
emoji_cli.rb Move more tasks to tootctl (#8675) 2018-09-14 17:42:22 +02:00
feeds_cli.rb Move more tasks to tootctl (#8675) 2018-09-14 17:42:22 +02:00
media_cli.rb Move more tasks to tootctl (#8675) 2018-09-14 17:42:22 +02:00
migration_helpers.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
premailer_webpack_strategy.rb ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
redis_config.rb Add support for separate Redis for cache (#7272) 2018-04-27 01:37:59 +02:00
snowflake.rb Fixes/do not override timestamps (#7336) 2018-05-03 23:02:46 +02:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00