mastodon/config
Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
2018-08-21 18:24:48 +02:00
..
environments
initializers Merge branch 'master' into glitch-soc/master 2018-08-21 18:24:48 +02:00
locales Merge branch 'master' into glitch-soc/master 2018-08-21 18:24:48 +02:00
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb
routes.rb Merge branch 'master' into glitch-soc/master 2018-08-21 18:24:48 +02:00
secrets.yml
settings.yml
sidekiq.yml
webpacker.yml