Merge "bugfix: /resources.json and /APIs cannot be accessed"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 17 May 2017 06:43:34 +0000 (06:43 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 17 May 2017 06:43:34 +0000 (06:43 +0000)

Trivial merge