Merge branch 'release/0.7.0' into develop

marjinal1st · Mar 29, 2014 · e3c550f · e3c550f
2 parents 99ba025 + 5ebaca5
commit e3c550f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 
 #### [Current]
+ * [99ba025](../../commit/99ba025) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
+
+#### 0.6.0
+ * [0f80209](../../commit/0f80209) - __(Ahmet Sezgin Duran)__ Bump versions 0.6.0 and 1.7.3
  * [72a817d](../../commit/72a817d) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
 
 #### 0.5.0

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This gem integrates [Medium Editor](https://github.com/daviferreira/medium-edito
 
 ## Version
 
-The latest version of Medium Editor bundled by this gem is [1.7.3](https://github.com/daviferreira/medium-editor/releases)
+The latest version of Medium Editor bundled by this gem is [1.7.5](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 = '0.6.0'
-    MEDIUM_EDITOR_VERSION = '1.7.3'
+    VERSION = '0.7.0'
+    MEDIUM_EDITOR_VERSION = '1.7.5'
   end
 end