Merge branch 'master' into develop

Conflicts: Gemfile.lock
adhearsion · Mar 7, 2014 · 930d53c · 930d53c
2 parents 5738a0b + 8b4e411
commit 930d53c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # develop
 
+# Version 0.2.1
+  * Removed Octarine from dependencies
+
 # Version 0.2.0
   * Reverted to using a pure Reel handler because Reel::App does not exist any more
 

diff --git a/lib/virginia/version.rb b/lib/virginia/version.rb
@@ -1,3 +1,3 @@
 module Virginia
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end
diff --git a/virginia.gemspec b/virginia.gemspec
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<adhearsion>, ["~> 2.4"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0"]
   s.add_runtime_dependency %q<reel>
-  s.add_runtime_dependency %q<octarine>
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]
   s.add_development_dependency %q<rspec>, ["~> 2.5"]