From b5e726d82ed2a00c0faa57d8d51349ab98d45e57 Mon Sep 17 00:00:00 2001
From: mengxiong10 <15623530290@163.com>
Date: Tue, 25 Jun 2019 17:16:07 +0800
Subject: [PATCH] 2.12.0

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1da0bb..ced2933 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# [2.12.0](https://github.com/mengxiong10/vue2-datepicker/compare/v2.11.2...v2.12.0) (2019-06-25)
+
+
+### Features
+
+* add the prop `time-select-options` ([#227](https://github.com/mengxiong10/vue2-datepicker/issues/227)) ([a55b4b6](https://github.com/mengxiong10/vue2-datepicker/commit/a55b4b6))
+
+
+
 ## [2.11.2](https://github.com/mengxiong10/vue2-datepicker/compare/v2.11.1...v2.11.2) (2019-05-15)
 
 
diff --git a/package-lock.json b/package-lock.json
index 19141f2..cddd993 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue2-datepicker",
-  "version": "2.11.2",
+  "version": "2.12.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b7e8dbb..9c10116 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "lib",
     "src"
   ],
-  "version": "2.11.2",
+  "version": "2.12.0",
   "scripts": {
     "dev": "cross-env NODE_ENV=development webpack-dev-server --hot --open --config build/webpack.dev.config.js",
     "demo": "cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.demo.config.js",