OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/spec/controllers/api
History
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
..
v1 Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
web
…
base_controller_spec.rb
…
oembed_controller_spec.rb
…
push_controller_spec.rb
…
salmon_controller_spec.rb
…
subscriptions_controller_spec.rb
…