Merge branch 'release/1.1.0' into develop

12 years ago · 3f9aa24936
3 changed files with 4 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -30,7 +30,6 @@ Icon
 *.sassc
 .sass-cache
 capybara-*.html
-.rspec
 .rvmrc
 /.bundle
 /vendor/bundle
--- a/.rspec
+++ b/.rspec
@ -0,0 +1,3 @@
+--color
+--format documentation
+--drb
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -74,7 +74,7 @@ GEM
      rest-client
      simplecov (>= 0.7)
      thor
-    crack (0.4.0)
+    crack (0.4.1)
      safe_yaml (~> 0.9.0)
    database_cleaner (1.0.1)
    debug_inspector (0.0.2)