luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 01:53:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
2020-01-04 23:04:42 +01:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
v2
web
base_controller_spec.rb
oembed_controller_spec.rb
proofs_controller_spec.rb