mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-24 01:32:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/more-crop-photos

Browse Source
This commit is contained in:
Shiny
2017-10-27 23:32:46 +13:00
committed by GitHub
parent af60489459 d9aa9df7fe
commit cd69ea1487
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile.lock
View File

@@ -31,7 +31,7 @@ GEM
activejob (4.2.10)
activesupport (= 4.2.10)
globalid (>= 0.3.0)
activemerchant (1.73.0)
activemerchant (1.74.0)
activesupport (>= 3.2.14, < 6.x)
builder (>= 2.1.2, < 4.0.0)
i18n (>= 0.6.9)
@@ -173,10 +173,10 @@ GEM
erubis (2.7.0)
excon (0.59.0)
execjs (2.7.0)
factory_girl (4.8.1)
factory_girl (4.9.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
railties (>= 3.0.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
@@ -193,7 +193,7 @@ GEM
gibbon (1.2.1)
httparty
multi_json (>= 1.9.0)
globalid (0.4.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
gravatar-ultimate (2.0.0)
activesupport (>= 2.3.14)
@@ -417,7 +417,7 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.19.0)
rake (12.1.0)
rake (12.2.1)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)