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.

Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
environments	…
initializers	…
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
webpack	…
application.rb	…
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
navigation.rb	…
puma.rb	…
routes.rb	…
secrets.yml	…
settings.yml	…
sidekiq.yml	…
webpacker.yml	…