Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCostas Yiotis <coyiotis@gmail.com>
Tue, 18 Nov 2014 12:25:16 +0000 (14:25 +0200)
committerCostas Yiotis <coyiotis@gmail.com>
Tue, 18 Nov 2014 12:25:16 +0000 (14:25 +0200)
commit558fe659b62f98ccc7f4e64cab68dee712a9be30
treeed9538557f1137d5c1c4342b1c9120247d580ba3
parent90c5da3ffa580fa4514579e405eb130adabe2ad5
parent8010fc83a4a36b759bdf0ca36f5498a88da8a161
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/urls.py