luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2019-07-24 16:23:53 +02:00
application.rb Change locale detection to run once per session (#8657) 2019-07-21 18:08:02 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
puma.rb Make puma bind address configurable with BIND env var (#11326) 2019-07-16 16:12:01 +02:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
sidekiq.yml Add tootctl preview_cards remove (#11320) 2019-07-28 13:48:19 +02:00
webpacker.yml