[Merge] ~chris.macnaughton/ubuntu/+source/horizon:master into ~ubuntu-server-dev/ubuntu/+source/horizon:master

[Albert Damen]

Shouldn't it be 

++recursive-include openstack_dashboard/conf *

with underscore instead of dash?
-- 
https://code.launchpad.net/~chris.macnaughton/ubuntu/+source/horizon/+git/horizon/+merge/385349
Your team Ubuntu Server Developers is requested to review the proposed merge of ~chris.macnaughton/ubuntu/+source/horizon:master into ~ubuntu-server-dev/ubuntu/+source/horizon:master.