diff options
| author | jessib <jessib@riseup.net> | 2012-11-06 10:14:35 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-11-06 10:14:35 -0800 |
| commit | 33988c40fbce6bba22f1a258148f63e4839c745d (patch) | |
| tree | 5b4154b868ca4f28294dd66cb98ee13de76e5442 | |
| parent | 2dff9a32e886220fe63152e905c0d7a32968f695 (diff) | |
| parent | e04dc9ab8b9f1aaaf75f327ef4fd0f7f4d755a12 (diff) | |
Merge branch 'develop' into help_develop
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| m--------- | users/app/assets/javascripts/srp | 0 |
2 files changed, 0 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index be3cebb..6792476 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,13 +81,6 @@ GEM couchrest_session_store (0.0.1) couchrest couchrest_model - debugger (1.2.1) - columnize (>= 0.3.1) - debugger-linecache (~> 1.1.1) - debugger-ruby_core_source (~> 1.1.4) - debugger-linecache (1.1.2) - debugger-ruby_core_source (>= 1.1.1) - debugger-ruby_core_source (1.1.4) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -181,7 +174,6 @@ PLATFORMS DEPENDENCIES bootstrap-sass (~> 2.1.0) coffee-rails (~> 3.2.2) - debugger haml (~> 3.1.7) haml-rails (~> 0.3.4) jquery-rails diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp -Subproject d6a78049f3356d9d645143362eca74434410bf6 +Subproject 3bf101bc1ef3b5a58fe2f1e2a2e7a681f6de6c0 |