git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6f7b21 1fe1446)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Mon, 21 Jul 2014 13:25:19 +0000 (10:25 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 21 Jul 2014 13:25:19 +0000 (10:25 -0300)
1  2 
portal/actions.py patch | diff1 | diff2 | blob | history
portal/homeview.py patch | diff1 | diff2 | blob | history
portal/registrationview.py patch | diff1 | diff2 | blob | history

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