cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Jacob Cody Wimer
2018-07-31 18:45:51 +00:00
parent 4b05833a33 74c2654299
commit d19c5f59a6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@@ -64,6 +64,7 @@ GEM
highline (~> 1.7.2) highline (~> 1.7.2)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
crass (1.0.4) crass (1.0.4)
daemons (1.2.6)
dalli (2.7.8) dalli (2.7.8)
delayed_job (4.1.5) delayed_job (4.1.5)
activesupport (>= 3.0, < 5.3) activesupport (>= 3.0, < 5.3)
@@ -272,6 +273,7 @@ DEPENDENCIES
bullet bullet
cancancan cancancan
coffee-rails coffee-rails
daemons
dalli dalli
delayed_job_active_record delayed_job_active_record
devise devise