mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-30 20:20:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into contributors-bots

Browse Source
This commit is contained in:
Brenda Wallace
2019-02-09 19:13:26 +13:00
committed by GitHub
parent 68d9b9c50c 3f68131ed1
commit 29da3f7ff1
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

@@ -134,7 +134,7 @@ GEM
activesupport (>= 3.0.0)
dalli (2.7.9)
database_cleaner (1.7.0)
devise (4.5.0)
devise (4.6.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
@@ -221,7 +221,7 @@ GEM
httparty (0.16.3)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.5.2)
i18n (1.5.3)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.28)
activesupport (>= 4.0.2)