merge
authorTony Mack <tmack@tux.cs.princeton.edu>
Wed, 3 Sep 2014 01:18:45 +0000 (21:18 -0400)
committerTony Mack <tmack@tux.cs.princeton.edu>
Wed, 3 Sep 2014 01:18:45 +0000 (21:18 -0400)
commitec23b99bb293e15eeae1c181fe8142f77cad81c1
treef0627090385e948e52ca5b99676685a4a9fdd6bf
parent4f3c9d5bb81a8a89419e337e5a8e1516c926d2e0
merge
planetstack/core/admin.py
planetstack/templates/admin/core/slice/change_form.html