diff options
| author | Azul <azul@leap.se> | 2012-11-06 11:51:45 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-06 11:51:45 +0100 |
| commit | dd372ceeb6f1ebbfd4ee4c9d2f960d0515083804 (patch) | |
| tree | c3d5feccccf4d6651ecb44e84a16a82b3cf7b287 | |
| parent | 19008253d01fd6d7a864e98a7ae5dc216070aee1 (diff) | |
| parent | cf1e7ee20f713068cadf5cfa78840115e0a8a081 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_web into develop
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| m--------- | users/app/assets/javascripts/srp | 0 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6792476..be3cebb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,6 +81,13 @@ 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) @@ -174,6 +181,7 @@ 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 23350b54ec2723e1b2e333626567c9fe9d1e264 +Subproject d6a78049f3356d9d645143362eca74434410bf6 |