Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 16 Jan 2015 14:07:57 +0000 (15:07 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 16 Jan 2015 14:07:57 +0000 (15:07 +0100)
commit52a0b9984635eab3576e652a3a55c7bb15f564d6
treeba732606c0ee5768ebe193041010b41beaecc487
parent4a466fedcdd0e77b71b1f4555a2468108aa417e6
parentefd6a77495dc7d01d9d5d620a9c7ca67c1d2431f
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

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