rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/controllers/api
History
Claire e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
 		2024-08-02 18:09:48 +02:00
..
v1 Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 2024-08-02 18:09:48 +02:00
v2
…
v2_alpha Change grouped notifications API shape (take 2) (#31214) 2024-07-31 10:50:13 +00:00
web
…
base_controller.rb Add endpoints for unread notifications count (#31191) 2024-07-30 08:39:11 +00:00
oembed_controller.rb
…