Merge branch 'devel'

# Conflicts: # History.md
stadia · Feb 9, 2017 · 3089e9d · 3089e9d
2 parents 9a32baf + 2832b85
commit 3089e9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/History.md b/History.md
@@ -1,14 +1,5 @@
-### 4.0.2 / 2016-11-13
+### 1.0.0 / 2017-02-09
 
-* Revert #237
+* Release
 
-### 4.0.1 / 2016-11-08 *** YANKED
-
-* Auto-load tasks (#237)
-
-### 4.0.0 / 2016-06-30
-
-* Support ActiveRecord 5.0 (#213)
-* Fix schema dump null issues in JRuby (#229)
-
-For earlier history, see the History file for the rgeo gem.
+For earlier history, see the History file for the rgeo gem.
diff --git a/lib/active_record/connection_adapters/mysql2rgeo/version.rb b/lib/active_record/connection_adapters/mysql2rgeo/version.rb
@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Mysql2Rgeo
-      VERSION = "4.0.2".freeze
+      VERSION = "1.0.0".freeze
     end
   end
 end