git://git.onelab.eu / plstackapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7b29d2 7b836b6)
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorSapan Bhatia <gwsapan@gmail.com>
Wed, 11 Jun 2014 21:51:32 +0000 (17:51 -0400)
committerSapan Bhatia <gwsapan@gmail.com>
Wed, 11 Jun 2014 21:51:32 +0000 (17:51 -0400)
Conflicts:
planetstack/core/models/user.py

1  2 
planetstack/core/models/user.py patch | diff1 | diff2 | blob | history

diff --cc planetstack/core/models/user.py
Simple merge
plstackapi