mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-28 19:51:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Brenda Wallace
2020-02-04 12:44:28 +13:00
parent 8dd70486c7 d15df948ff
commit 5a3c06f490
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@@ -533,7 +533,7 @@ GEM
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.6.1)
unicorn (5.5.3)
unicorn (5.5.2)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.13.0)