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

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
 	Gemfile.lock
This commit is contained in:
David Yip
2018-05-04 09:42:31 -05:00
parent c511b0f72a 251bbf9728
commit 77a92d3260
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -709,7 +709,7 @@ DEPENDENCIES
pg (~> 1.0)
pghero (~> 2.1)
pkg-config (~> 1.3)
posix-spawn
posix-spawn (~> 0.3)
premailer-rails
private_address_check (~> 0.4.1)
pry-byebug (~> 3.6)