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

Merge branch 'dev' into dependabot/bundler/comfortable_mexican_sofa-1.12.11

Browse Source
This commit is contained in:
Daniel O'Connor
2018-07-02 13:20:41 +09:30
committed by GitHub
parent 1096fd0e89 4fd0096c85
commit dd0e9f74e6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS.md
View File

@@ -88,4 +88,4 @@ submit the change with your pull request.
## Bots
- Security and Dependency Updates / [deppbot](https://github.com/deppbot) & [dependabot](https://github.com/dependabot)
- Security and Dependency Updates / [deppbot](https://github.com/deppbot) & [dependabot[bot]](https://github.com/dependabot)

4
Gemfile.lock
View File

@@ -368,7 +368,7 @@ GEM
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.10)
rack-protection (2.0.1)
rack-protection (2.0.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
@@ -507,7 +507,7 @@ GEM
trollop (1.16.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.10)
uglifier (4.1.13)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.2)
unicorn (5.4.0)