git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d7dc8d
66f4e61
)
Merge branch 'master' of git.planet-lab.org:/git/plstackapi
author
Siobhan Tully
<stully@verivue.com>
Tue, 2 Jul 2013 17:19:47 +0000
(13:19 -0400)
committer
Siobhan Tully
<stully@verivue.com>
Tue, 2 Jul 2013 17:19:47 +0000
(13:19 -0400)
1
2
planetstack/core/admin.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
planetstack/core/admin.py
Simple merge