git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d9c4cf9)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorPedro, Carlos and Rezende <pedroeusebio, carlos, rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:00:22 +0000 (16:00 -0200)
committerPedro, Carlos and Rezende <pedroeusebio, carlos, rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:00:22 +0000 (16:00 -0200)
Conflicts:
portal/homeview.py
portal/sliceresourceview.py
portal/templates/slice-resource-view.html


No differences found
myslice (django)