diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-03-26 15:44:38 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-26 15:44:38 +0000 |
| commit | 76094fe2d35407b85024011f5b8463e702d69bd5 (patch) | |
| tree | 1b44d14cfb4b466750e9953b710baa9c8936d721 | |
| parent | 29f4c58b21801587266162ac00fab7faac6c3775 (diff) | |
| parent | 8dbb7cb8b04131ca71ea5390e786b8857a6a0fc4 (diff) | |
Merge branch 'update-eventmachine-to-1.04' into rails-3-develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -33,7 +33,7 @@ gem 'secure_headers', '~> 1.3.4' gem 'statistics2', '~> 0.54' gem 'syslog_protocol', '~> 0.9.2' gem 'thin', '~> 1.5.1' -gem 'vpim', '~> 13.11.11' +gem 'vpim', '~> 13.11.11' gem 'will_paginate', '~> 3.0.5' # when 1.2.9 is released by the maintainer, we can stop using this fork: gem 'xapian-full-alaveteli', '~> 1.2.9.5' diff --git a/Gemfile.lock b/Gemfile.lock index 847819321..2f88a474e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,7 @@ GEM diff-lcs (1.2.4) dynamic_form (1.1.4) erubis (2.7.0) - eventmachine (1.0.3) + eventmachine (1.0.7) exception_notification (3.0.1) actionmailer (>= 3.0.4) activesupport (>= 3.0.4) @@ -263,7 +263,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.7) + sqlite3 (1.3.10) statistics2 (0.54) syslog_protocol (0.9.2) text (1.2.1) |