Merge tag '1.2.0' into develop

1.2.0
marjinal1st · Feb 7, 2015 · 423eaf7 · 423eaf7
2 parents e6d136d + e980abc
commit 423eaf7
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]
+ * [e6d136d](../../commit/e6d136d) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
+ * [7ee9c60](../../commit/7ee9c60) - __(Ahmet Sezgin Duran)__ Merge tag '1.1.3' into develop
+
+1.1.3
+
+#### 1.1.3
+ * [8cc5af9](../../commit/8cc5af9) - __(Ahmet Sezgin Duran)__ Bump versions 1.1.3 and 2.1.3
  * [9a54e41](../../commit/9a54e41) - __(Ahmet Sezgin Duran)__ Update Medium Editor files
  * [67de6b2](../../commit/67de6b2) - __(Ahmet Sezgin Duran)__ Merge tag '1.1.2' 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.1.3](https://github.com/daviferreira/medium-editor/releases)
+The latest version of Medium Editor bundled by this gem is [2.2.0](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.1.3'
-    MEDIUM_EDITOR_VERSION = '2.1.3'
+    VERSION = '1.2.0'
+    MEDIUM_EDITOR_VERSION = '2.2.0'
   end
 end