Merge branch 'hotfix/v2.6.7' into develop

ctran · ctran · commit cd31584d0079 · 2015-03-10T15:44:38.000-07:00
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,6 @@
+== 2.6.7
+* Nothing annotated unless options[:model_dir] is specified, #234
+
 == 2.6.6
 * Makes it possible to wrap annotations, #225
 * Fix single model generation, #214
diff --git a/lib/annotate/version.rb b/lib/annotate/version.rb
@@ -1,5 +1,5 @@
 module Annotate
   def self.version
-    '2.6.6'
+    '2.6.7'
   end
 end
