resolved conflicts

2013-12-22 09:04:13 +01:00
parent c2a04384ef fa7835f174
commit a2909d55ef
60 changed files with 770 additions and 48 deletions
--- a/2
+++ b/2
@@ -34,7 +34,7 @@ end

 gem 'rack-cors', :require => 'rack/cors'

-gem 'ridc', '~> 0.0.7'
+gem 'ridc', '~> 0.0.8'

 # Use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.1.2'