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 
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
This commit is contained in:
Thibaut Girka
2018-05-16 21:52:38 +02:00
parent 80aad16e10 6bed372ad2
commit 78ac246b87
62 changed files with 672 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@ -389,7 +389,7 @@ GEM
pghero (2.1.0)
activerecord
pkg-config (1.3.0)
posix-spawn (0.3.13)
posix-spawn (0.3.12)
powerpack (0.1.1)
premailer (1.11.1)
addressable
@ -714,7 +714,7 @@ DEPENDENCIES
pg (~> 1.0)
pghero (~> 2.1)
pkg-config (~> 1.3)
posix-spawn (~> 0.3)
posix-spawn (= 0.3.12)
premailer-rails
private_address_check (~> 0.4.1)
pry-byebug (~> 3.6)