git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cd2425 b9ee627)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 25 Feb 2014 15:43:33 +0000 (16:43 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 25 Feb 2014 15:43:33 +0000 (16:43 +0100)
1  2 
portal/registrationview.py patch | diff1 | diff2 | blob | history
portal/slicerequestview.py patch | diff1 | diff2 | blob | history

diff --cc portal/registrationview.py
Simple merge
diff --cc portal/slicerequestview.py
Simple merge
myslice (django)