Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorroot <root@Portable>
Tue, 4 Mar 2014 18:02:45 +0000 (19:02 +0100)
committerroot <root@Portable>
Tue, 4 Mar 2014 18:02:45 +0000 (19:02 +0100)
commit7d2c00e6d31849371ca20fc4f6dd009db581134a
tree29fadcebb81d8dbed2be30e9e7f55343602e20c8
parenta4e4119a5851a775863e8a5e733f7214db4a37fc
parentc3ea0056ecc3705f7bc0da6acd2bb9ab5442552f
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/static/js/myslice-ui.js