Glitch-Shrike/spec
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
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
fabricators
features
fixtures
helpers
lib
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
policies
presenters
requests
routing
services
support
validators
views
workers
rails_helper.rb
spec_helper.rb