Merge branch 'design_team' into dashboard

This commit is contained in:
Christophe Vilayphiou committed 2012-02-23 16:05:33 +08:00
commit f8d1d7242d
13 files changed
+3425 -3451

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ gem 'exception_notification' # Send error trace
gem 'execjs'
gem 'jquery-rails'
gem 'kaminari'
gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
gem 'mini_magick'
gem 'mongoid'