git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb342c8 d5867eb)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 25 Feb 2014 16:14:43 +0000 (17:14 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 25 Feb 2014 16:14:43 +0000 (17:14 +0100)
1  2 
portal/actions.py patch | diff1 | diff2 | blob | history
portal/registrationview.py patch | diff1 | diff2 | blob | history
portal/slicerequestview.py patch | diff1 | diff2 | blob | history

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