mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-31 12:20:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into plantings-validators

Browse Source
This commit is contained in:
Shiny
2017-04-23 19:35:37 +12:00
committed by GitHub
parent e9a5ef0058 9d20fafd06
commit dfeb4804e7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@@ -73,7 +73,7 @@ GEM
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bootstrap_form (2.6.0)
bootstrap_form (2.7.0)
builder (3.2.3)
bullet (5.5.1)
activesupport (>= 3.0.0)
@@ -446,7 +446,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.3.0)
selenium-webdriver (3.4.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)