Merge branch 'master' into notes

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 30ddc7af4111eb1444b0b6e02075afe26c49d67b..4b2d2ba9e0351ce6d7e2de3ab2ad17fbc1115498 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,9 @@ gem 'pg'
 # Load jquery support
 gem 'jquery-rails'
 
+# Load R2 for RTL conversion
+gem 'r2'
+
 # Load rails plugins
 gem 'rails-i18n', ">= 0.6.3"
 gem 'dynamic_form'
@@ -26,6 +29,7 @@ gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'i18n-js', '>= 3.0.0.rc2'
 gem 'rack-cors'
+gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'