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
2019-03-08 20:15:57 +01:00
parent 29a09858f6 3f4a6d44fe
commit 674fe32f97
5 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -402,7 +402,7 @@ GEM
pg (1.1.4)
pghero (2.2.0)
activerecord
pkg-config (1.3.4)
pkg-config (1.3.5)
powerpack (0.1.2)
premailer (1.11.1)
addressable