Glitch-Shrike/spec
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
controllers
fabricators
features
fixtures
helpers
lib
mailers
models
policies
presenters
requests
routing
serializers/activitypub
services
support
validators
views
workers
rails_helper.rb
spec_helper.rb