merge Amisha's changes
authorScott Baker <smbaker@gmail.com>
Wed, 9 Apr 2014 06:40:56 +0000 (23:40 -0700)
committerScott Baker <smbaker@gmail.com>
Wed, 9 Apr 2014 06:40:56 +0000 (23:40 -0700)
commit537d823597fc37a0f648f69b08c3f0d4d654d775
treeb0bcc4f9a400d05e526045d68f861f9705f437c8
parent6719811033470900c07489a3d308e195b7197a6d
merge Amisha's changes
planetstack/core/models/slice.py
planetstack/core/plus/sites.py
planetstack/core/plus/views.py
planetstack/core/serializers.py
planetstack/core/static/planetstack.css
planetstack/templates/admin/dashboard/tenant.html [new file with mode: 0644]
planetstack/templates/admin/dashboard/welcome.html