git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f4f816 2b1211c)
Merge branch 'master' of git://git.onelab.eu/myslice
authorLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:16:07 +0000 (12:16 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:16:07 +0000 (12:16 +0200)
Conflicts:
portal/registrationview.py

1  2 
portal/sliceview.py patch | diff1 | diff2 | blob | history
portal/templates/registration_view.html patch | diff1 | diff2 | blob | history

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