git://git.onelab.eu / plstackapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 557b693 b0e7168)
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)
1  2 
planetstack/core/dashboard/views/view_common.py patch | diff1 | diff2 | blob | history
planetstack/core/fixtures/initial_data.json patch | diff1 | diff2 | blob | history
planetstack/planetstack/settings.py patch | diff1 | diff2 | blob | history

diff --cc planetstack/planetstack/settings.py
Simple merge
plstackapi