merge Amisha changes
authorScott Baker <smbaker@gmail.com>
Fri, 29 Aug 2014 18:43:23 +0000 (11:43 -0700)
committerScott Baker <smbaker@gmail.com>
Fri, 29 Aug 2014 18:43:23 +0000 (11:43 -0700)
commita36d77e0c9716b0f28b9fda031a751bac2ee11c1
tree2ade8d7a4072ae8d3828c3e0d122e5f8541deba5
parent866c5b39223e027f89b8e467b8afa35cb4d9c9b0
merge Amisha changes
planetstack/core/dashboard/sites.py
planetstack/core/models/user.py
planetstack/templates/admin/dashboard/tenant.html