diff options
| author | jessib <jessib@riseup.net> | 2013-12-30 13:32:11 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-12-30 13:32:11 -0800 |
| commit | 8db811678404aa9a33c54805f8fba4afb932c1f4 (patch) | |
| tree | e94f2d44be2af63999fb1b332f8a795bb8a35b26 /Gemfile.lock | |
| parent | 7f12c795207ac818bffac42aa581bf1165f9e424 (diff) | |
| parent | 62f31ab0358bc165c9a83806db1828365cb96572 (diff) | |
Merge branch 'develop' into feature/messages_api
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 cc549ee..09d3123 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,6 +166,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) @@ -283,6 +285,8 @@ DEPENDENCIES leap_web_core! leap_web_help! leap_web_users! + minitest + minitest-stub-const mocha (~> 0.13.0) phantomjs-binaries poltergeist |