luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-20 17:08:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
2018-10-09 21:08:26 +02:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 12:12:03 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 12:12:03 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
application.rb
boot.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
secrets.yml
settings.yml
sidekiq.yml Track historical space stats in PgHero to determine PostgreSQL growth (#8906) 2018-10-09 19:35:14 +02:00
webpacker.yml