diff options
| author | Alex Denisov <1101.debian@gmail.com> | 2012-09-26 17:14:47 +0400 |
|---|---|---|
| committer | Alex Denisov <1101.debian@gmail.com> | 2012-09-26 17:14:47 +0400 |
| commit | c09d233611e00328f0e8d493a106737f0638d9a2 (patch) | |
| tree | 351383104571ab0fb536506918860c7eb50a0eeb /Gemfile.lock | |
| parent | e6ce47291b3f08ebe18c2450fc4f21a2a3a2b8a9 (diff) | |
| parent | 3c132f2e6896c7c1aa787ddc61ae230d9a205700 (diff) | |
Merge branch 'master' into fix_project_access_notification
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 100e88d0fd2..f9a0128f0e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,6 +199,7 @@ GEM httpauth (0.1) i18n (0.6.1) journey (1.0.4) + jquery-atwho-rails (0.1.6) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) @@ -441,6 +442,7 @@ DEPENDENCIES haml-rails headless httparty + jquery-atwho-rails (= 0.1.6) jquery-rails (= 2.0.2) jquery-ui-rails (= 0.5.0) kaminari |