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

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

Browse Source
This commit is contained in:
Thibaut Girka
2018-10-23 17:15:57 +02:00
parent 0c7f710be1 65867b6e61
commit 8f3096b846
12 changed files with 158 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@@ -387,7 +387,7 @@ GEM
av (~> 0.9.0)
paperclip (>= 2.5.2)
parallel (1.12.1)
parallel_tests (2.23.0)
parallel_tests (2.24.0)
parallel
parser (2.5.1.2)
ast (~> 2.4.0)
@@ -717,7 +717,7 @@ DEPENDENCIES
ox (~> 2.10)
paperclip (~> 6.0)
paperclip-av-transcoder (~> 0.6)
parallel_tests (~> 2.23)
parallel_tests (~> 2.24)
pg (~> 1.1)
pghero (~> 2.2)
pkg-config (~> 1.3)