luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 00:46:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
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
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
application.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
boot.rb
brakeman.ignore Add animate custom emoji param to embed pages (#8507) 2018-08-30 23:14:01 +02:00
database.yml
deploy.rb
environment.rb
i18n-tasks.yml Ignore tootsuite-specific theme-related translation strings 2018-05-10 00:03:34 +02:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00
puma.rb Revert "Default puma to running on localhost only." (#8444) 2018-08-26 00:13:22 +02:00
routes.rb Allow to show a specific status in the admin interface 2018-09-03 18:19:11 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00
sidekiq.yml Update docker config and move some workers to different queues (#8345) 2018-09-02 16:13:06 +02:00
webpacker.yml Fix building assets in test environment 2018-09-13 15:32:02 +02:00