Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 24 Oct 2013 15:09:24 +0000 (17:09 +0200)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 24 Oct 2013 15:09:24 +0000 (17:09 +0200)
commitb8285e0fe053a91e94dd6641e5daa3c6dd52c43e
treed14a4db443caea76033a920994dfbdc8325c6f55
parent38afe61d364a7035df19f00a786c5788a55fb138
parent995a5c95d891a66069add9f7fe52bbedbcf05369
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
portal/resourceview.py