developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	Gemfile
	app/models/ad_banner.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-15 23:02:22 +08:00
2 parents 77deffb512 80e84c10ba
commit f950f77f36
146 files changed
+14041 -116
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Gemfile
+1
View File
@@ -34,6 +34,7 @@ gem 'sprockets'
gem 'tinymce-rails'
gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
gem "impressionist", :require => "impressionist", :path => "vendor/impressionist"
# Gems used only for assets and not required
# in production environments by default.