From: Kiran Kashalkar <kiran.kashalkar@riftio.com>
Date: Thu, 11 May 2017 14:18:41 +0000 (+0000)
Subject: Merge branch 'v2.0'
X-Git-Tag: v3.0.0rc~19
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=7fd60fa822ec5bc1032f87ae0bcd1e1617d880bf

Merge branch 'v2.0'
---

7fd60fa822ec5bc1032f87ae0bcd1e1617d880bf