Merge branch 'master' into merge-master-arno 96/1396/1
[genesis.git] / compass / deploy / ansible / roles / dashboard / templates /
drwxr-xr-x   ..
-rw-r--r-- 16774 local_settings.py
-rw-r--r-- 389 openstack-dashboard.conf