mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 13:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into js-clean

Browse Source
This commit is contained in:
Shiny
2017-03-04 17:09:01 +13:00
committed by GitHub
parent 1e0ccd72a2 175780aa06
commit 864990dc8a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@@ -51,7 +51,7 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
arel (6.0.4)
ast (2.3.0)
autoprefixer-rails (6.7.5)
autoprefixer-rails (6.7.6)
execjs
bcrypt (3.1.11)
better_errors (2.1.1)
@@ -258,7 +258,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
js-routes (1.3.2)
js-routes (1.3.3)
railties (>= 3.2)
sprockets-rails
json (2.0.3)
@@ -441,7 +441,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.2.1)
selenium-webdriver (3.2.2)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)