This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/config
Thibaut Girka 7039dca12c Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
2019-07-07 13:49:31 +02:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-04 16:21:39 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
webpack Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
application.rb Fix converted media being saved with original extension and mime type (#11130) 2019-06-20 10:52:36 +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-06-10 18:59:53 +02:00
puma.rb
routes.rb Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream 2019-07-07 13:49:31 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
sidekiq.yml
webpacker.yml