Merge tag '1.4.2' into develop

1.4.2
marjinal1st · Feb 16, 2015 · 0b99797 · 0b99797
2 parents cad5c5c + 6da793a
commit 0b99797
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 
 #### [Current]
+ * [cad5c5c](../../commit/cad5c5c) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
+ * [2666922](../../commit/2666922) - __(Ahmet Sezgin Duran)__ Merge tag '1.3.0' into develop
+
+1.3.0
+
+#### 1.3.0
+ * [88e8565](../../commit/88e8565) - __(Ahmet Sezgin Duran)__ Bump versions 1.3.0 and 2.3.0
  * [0ce611b](../../commit/0ce611b) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
  * [423eaf7](../../commit/423eaf7) - __(Ahmet Sezgin Duran)__ Merge tag '1.2.0' into develop
 

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This gem integrates [Medium Editor](https://github.com/daviferreira/medium-edito
 
 ## Version
 
-The latest version of Medium Editor bundled by this gem is [2.3.0](https://github.com/daviferreira/medium-editor/releases)
+The latest version of Medium Editor bundled by this gem is [2.4.2](https://github.com/daviferreira/medium-editor/releases)
 
 ## Installation
 

diff --git a/lib/medium-editor-rails/version.rb b/lib/medium-editor-rails/version.rb
@@ -1,6 +1,6 @@
 module MediumEditorRails
   module Rails
-    VERSION = '1.3.0'
-    MEDIUM_EDITOR_VERSION = '2.3.0'
+    VERSION = '1.4.2'
+    MEDIUM_EDITOR_VERSION = '2.4.2'
   end
 end