diff options
| author | elijah <elijah@riseup.net> | 2015-03-17 15:06:54 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-03-17 15:06:54 -0700 |
| commit | 74a8f39a0d91f7f992c41cced01f80f24001e173 (patch) | |
| tree | 2c459d89ed9d1e284098dc43715db813eab97f27 /Gemfile.lock | |
| parent | 2d42b4a39eaa346b94fa4aa2bb90bebb5621112e (diff) | |
| parent | 25b34acce7612f58c5d40819de79734b08cdfb8f (diff) | |
Merge branch 'develop' into version/0.6.1version/0.6.1
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4625690..5b033ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,9 @@ -GIT - remote: https://github.com/leapcode/couchrest_changes - revision: 25bd12efbff7be971cc76939a230e82c62b966ef - branch: master - specs: - couchrest_changes (0.1.1) - couchrest (~> 1.1.3) - syslog_logger (~> 2.0.0) - yajl-ruby - PATH remote: . specs: - tapicero (0.6) + tapicero (0.6.1) couchrest (~> 1.1.3) - couchrest_changes (~> 0.1.1) + couchrest_changes (= 0.2.0) daemons syslog_logger (~> 2.0.0) yajl-ruby (~> 1.1.0) @@ -25,6 +15,10 @@ GEM mime-types (~> 1.15) multi_json (~> 1.0) rest-client (~> 1.6.1) + couchrest_changes (0.2.0) + couchrest (~> 1.1.3) + syslog_logger (~> 2.0.0) + yajl-ruby daemons (1.1.9) highline (1.6.19) json (1.8.1) @@ -47,7 +41,6 @@ PLATFORMS ruby DEPENDENCIES - couchrest_changes! highline minitest (~> 5.4.0) mocha |