Merge branch 'stable' of github.com:Compass/compass-rails into stable

dhayalan · Feb 2, 2012 · aaac769 · aaac769
2 parents 093feb3 + 652c967
commit aaac769
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :assets do
-  gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => :master
+  gem 'compass'
   gem 'compass-rails', :path => '.'
 end
 
@@ -19,4 +19,4 @@ unless ENV["CI"]
   gem 'ruby_gntp', :require => false
   gem 'guard'
   gem 'guard-test'
-end
+end
diff --git a/lib/compass/app_integration/rails.rb b/lib/compass/app_integration/rails.rb