Merge branch 'develop' of github.com:thematters/matters-web into develop

thematters · Apr 2, 2019 · 1a03c66 · 1a03c66
2 parents 48884d6 + 5894ae9
commit 1a03c66
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - 2019-04-02
+
+### Added
+
+- Editor: Embed - YouTube, Vimeo and JSFiddle #166
+- Editor: @user #169
+- Editor: SmartBreak #168 #170
+- About Page #180
+- OpenSearch #176
+
+# Changed
+
+- Fix notice dropdown positioning issue with max-height #167
+
 ## [1.1.1] - 2019-03-28
 
 ### Added

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "codebase of Matters' website",
   "author": "",
   "engines": {