From: Jack Morgan <jack.morgan@intel.com>
Date: Mon, 29 Aug 2016 18:25:13 +0000 (+0000)
Subject: Merge changes from topic 'pharos-dashboard'
X-Git-Tag: 6.0.0~142
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c3338109091fe880d7dd40966b9e7aa2ad7fd132;p=pharos.git

Merge changes from topic 'pharos-dashboard'

* changes:
  Add a Booking detail view
  Remove development settings
---

c3338109091fe880d7dd40966b9e7aa2ad7fd132