Merge branch 'master' of git://git.planet-lab.org/plstackapi
authorjcnelson <jcnelson@cs.princeton.edu>
Wed, 16 Jul 2014 19:31:08 +0000 (15:31 -0400)
committerjcnelson <jcnelson@cs.princeton.edu>
Wed, 16 Jul 2014 19:31:08 +0000 (15:31 -0400)
commit33bc04a2cf7b1a37681c4fa0c12b1100d034041a
tree5655e453cbeb14b3b0f637d76d015a66840d5970
parent557b6937a312d10055c8cc40285c195a320ceee3
parentb0e7168ce5182272691e22122acb7be3800cfa13
Merge branch 'master' of git://git.planet-lab.org/plstackapi
planetstack/core/dashboard/views/view_common.py
planetstack/core/fixtures/initial_data.json
planetstack/planetstack/settings.py