luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-19 05:54:43 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
v2
web
base_controller_spec.rb
oembed_controller_spec.rb
proofs_controller_spec.rb Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
push_controller_spec.rb
salmon_controller_spec.rb
subscriptions_controller_spec.rb