git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 594732a 17bbc2c)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:01 +0000 (13:13 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:01 +0000 (13:13 -0300)
Conflicts:
portal/registrationview.py
portal/slicerequestview.py
ui/topmenu.py

1  2 
portal/sliceresourceview.py patch | diff1 | diff2 | blob | history
portal/templates/slice-tab-users-view.html patch | diff1 | diff2 | blob | history

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