diff options
author | jessib <jessib@riseup.net> | 2013-12-30 13:32:43 -0800 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-12-30 13:32:43 -0800 |
commit | c3fadeb8da6eb4400a3ceb2fecee83173eceeaf2 (patch) | |
tree | 88b550fbda71286266831910913e6789b89ef2ea /Gemfile.lock | |
parent | 7d1a25c2477b9607475f6b4c56f94d392c46950a (diff) | |
parent | 62f31ab0358bc165c9a83806db1828365cb96572 (diff) |
Merge branch 'develop' into feature/messages_cron
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7d5f798..b42ac86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,6 +168,8 @@ GEM metaclass (0.0.1) mime-types (1.25.1) mini_portile (0.5.2) + minitest (4.7.5) + minitest-stub-const (0.1) mocha (0.13.3) metaclass (~> 0.0.1) multi_json (1.8.2) @@ -288,6 +290,8 @@ DEPENDENCIES leap_web_core! leap_web_help! leap_web_users! + minitest + minitest-stub-const mocha (~> 0.13.0) phantomjs-binaries poltergeist |