Merge branch 'master' into tests-rspec

Conflicts: Gemfile
2013-09-07 01:11:24 +02:00 · 2013-09-07 01:11:24 +02:00 · 7de57715f2
commit 7de57715f2
parent 37e5b0c25c 9922c0322a
21 changed files with 2010 additions and 72 deletions
--- a/3
+++ b/3
@ -85,6 +85,3 @@ group :test do
  gem 'rspec-expectations'
  gem 'i18n-spec'
 end
-
-# Gems left for backwards compatibility
-gem 'acts_as_configurable', git: 'git://github.com/bwalding/acts_as_configurable.git' # user settings migration needs it