From fc73ba5f5c6ad75d5f4558e3dd3855c936070ebe Mon Sep 17 00:00:00 2001
From: zhangab <zhanganbing@chinamobile.com>
Date: Wed, 28 Nov 2018 00:14:37 +0800
Subject: Merge master code to casablanca branch

Change-Id: Ibbb20f2b8a37e271a0ffa6d962cecfdae84bbabb
Issue-ID: USECASEUI-153
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
---
 version.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'version.properties')

diff --git a/version.properties b/version.properties
index 1f3ede11..a254b216 100644
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=2
-patch=2
+minor=3
+patch=0
 
 base_version=${major}.${minor}.${patch}
 
-- 
cgit 1.2.3-korg