From f8765453077661ea05a1bb8b1225ee5ecdb0e5e8 Mon Sep 17 00:00:00 2001
From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 31 Jan 2019 21:35:51 +0000
Subject: [PATCH] merging master into branch v5.0

Change-Id: Ie70c3a3724fbf8795ec826f8bf727138df86059c
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---
 osm_nbi/html_public/version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osm_nbi/html_public/version b/osm_nbi/html_public/version
index 9380d32..d3d1eab 100644
--- a/osm_nbi/html_public/version
+++ b/osm_nbi/html_public/version
@@ -1,2 +1,2 @@
-0.1.35
-2018-01-25
+0.1.36
+2019-01-31
-- 
2.25.1