mastodon/spec
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
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
features
fixtures
helpers
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
policies
presenters
requests
routing
services Merge branch 'master' into glitch-soc/master 2018-08-21 18:24:48 +02:00
support
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
workers
rails_helper.rb
spec_helper.rb