git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e348dd
e33ccb0
)
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
author
Jordan Augé
<jordan.auge@lip6.fr>
Mon, 29 Jul 2013 03:42:55 +0000
(
05:42
+0200)
committer
Jordan Augé
<jordan.auge@lip6.fr>
Mon, 29 Jul 2013 03:42:55 +0000
(
05:42
+0200)
1
2
portal/views.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
portal/views.py
Simple merge