luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-18 02:26:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Thibaut Girka e71b16ae2b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2020-11-25 15:31:45 +01:00
v2
web Fix not being able to enable status notifications in Web Push API (#14822) 2020-09-21 17:48:55 +02:00
base_controller.rb Fix 2FA/sign-in token sessions being valid after password change (#14802) 2020-11-12 23:05:01 +01:00
oembed_controller.rb
proofs_controller.rb