Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.		2018-08-18 18:04:49 +02:00
..
environments
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
webpack
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
brakeman.ignore	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
secrets.yml
settings.yml
sidekiq.yml
webpacker.yml