tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2022-04-04 17:25:57 +02:00
parent 3381a0e6e0 80ded02a4b
commit d01c5b0b8c
8 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -461,7 +461,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.6)
puma (5.6.2)
puma (5.6.4)
nio4r (~> 2.0)
pundit (2.2.0)
activesupport (>= 3.0.0)