mastodon/config
Thibaut Girka be4849c083 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
webpack Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01:00
application.rb Fix localization test failing due to order of locale definitions (#12393) 2019-11-15 21:00:09 +01:00
boot.rb Fix bootsnap cache directory being declared relatively (#9511) 2018-12-13 05:19:52 +01:00
brakeman.ignore
database.yml
deploy.rb Bump capistrano from 3.11.1 to 3.11.2 (#12012) 2019-10-04 11:11:36 +09:00
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
pghero.yml Use override_csp options on pghero (#12489) 2019-11-27 05:28:11 +01:00
puma.rb
routes.rb Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
sidekiq.yml
webpacker.yml