merge amisha changes
authorScott Baker <smbaker@gmail.com>
Tue, 5 Aug 2014 16:51:40 +0000 (09:51 -0700)
committerScott Baker <smbaker@gmail.com>
Tue, 5 Aug 2014 16:51:40 +0000 (09:51 -0700)
commit6985cd54f4ac4734d5251bca4f4b5e6f3a27666b
tree99a6787f51532139afa893211c7c2c903ff3b9d1
parenta4d3e38eb05a470ae937213d1815facc9873de54
merge amisha changes
planetstack/core/static/planetstack.css
planetstack/templates/admin/login.html