Merge "Add function to upload image from local/url in GUI"
authorJing Lu <lvjing5@huawei.com>
Fri, 25 Aug 2017 00:50:21 +0000 (00:50 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 25 Aug 2017 00:50:21 +0000 (00:50 +0000)

Trivial merge