Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Sun, 6 Jul 2014 17:56:52 +0000 (19:56 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Sun, 6 Jul 2014 17:56:52 +0000 (19:56 +0200)
commitd81f5f5ca87b6eba05adb93cd27ac3c9952cc294
tree91b0d81abd33cab9a2e6b8106e0bb936ba9b0d76
parentf74a2e086a4c8fd787d1879d17a24fe6cef9d5ac
parentec5bde32fc8594f89a5b07035d39bffc4608cb0d
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/sliceresourceview.py
portal/sliceresourceview.py
portal/templates/base.html