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-07-22 09:58:35 +02:00
parent 0a61b000e3 76ff452306
commit d799fe2082
50 changed files with 983 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@ -407,7 +407,7 @@ GEM
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
nio4r (2.5.8)
nokogiri (1.13.6)
nokogiri (1.13.7)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nsa (0.2.8)
@ -415,7 +415,7 @@ GEM
concurrent-ruby (~> 1.0, >= 1.0.2)
sidekiq (>= 3.5)
statsd-ruby (~> 1.4, >= 1.4.0)
oj (3.13.16)
oj (3.13.17)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)