mastodon/spec
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
fabricators Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
features
…
fixtures
…
helpers Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
lib Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
mailers
…
models Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
policies
…
presenters
…
requests
…
routing
…
services Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
support
…
validators
…
views Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
workers
…
rails_helper.rb
…
spec_helper.rb Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00