Mastodon

Files

Thibaut Girka 032a669622 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/views/admin/settings/edit.html.haml
  Conflict on theme VS flavour/skin handling.
  Keep our version.

2019-06-19 18:49:25 +02:00

…

2019-06-10 18:59:53 +02:00

2019-06-19 18:49:25 +02:00

2019-06-04 20:40:19 +02:00

application.rb

…

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

2019-06-10 18:59:53 +02:00

navigation.rb

2019-06-10 18:59:53 +02:00

puma.rb

…

routes.rb

2019-06-10 18:59:53 +02:00

secrets.yml

…

settings.yml

2019-06-03 14:54:30 +02:00

sidekiq.yml

…

webpacker.yml

…