git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ab385c8
90ecab1
)
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
author
Scott Baker
<smbaker@gmail.com>
Mon, 26 Jan 2015 06:16:24 +0000
(22:16 -0800)
committer
Scott Baker
<smbaker@gmail.com>
Mon, 26 Jan 2015 06:16:24 +0000
(22:16 -0800)
1
2
planetstack/core/admin.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
planetstack/core/admin.py
Simple merge