merged changes
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 16:05:19 +0000 (17:05 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 16:05:19 +0000 (17:05 +0100)
commitd5867ebb7c85a07fd5b9dad155c9a82048b3e706
tree1fd52ce90b6fe83f52d2d15f784f9b32bf1765bf
parent9ebf5810d0e4568543e8c49c8f59053320b2ef43
parentda0b290c0d86afe3d388f4b1a8be60a70b39ed92
merged changes
myslice/urls.py
portal/sliceview.py
portal/templates/onelab/onelab_home-view.html
rest/__init__.py