git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 6818940)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 12 Mar 2014 18:06:38 +0000 (19:06 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 12 Mar 2014 18:06:38 +0000 (19:06 +0100)
Conflicts:
portal/templates/onelab/onelab_slice-resource-view.html


No differences found
myslice (django)