Merge changes from topic 'pharos-dashboard'
authorJack Morgan <jack.morgan@intel.com>
Mon, 29 Aug 2016 18:25:13 +0000 (18:25 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 29 Aug 2016 18:25:13 +0000 (18:25 +0000)
commitc3338109091fe880d7dd40966b9e7aa2ad7fd132
tree17ffec71ee1e92a0411ff1e92fe9a0e28cc397bb
parent409adcfcd3521640e0616638cf281c78e7eb2ea8
parent4ef923cbe9d4d4f3348657389661ffa99e89f919
Merge changes from topic 'pharos-dashboard'

* changes:
  Add a Booking detail view
  Remove development settings