Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 27 Feb 2014 10:44:36 +0000 (11:44 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 27 Feb 2014 10:44:36 +0000 (11:44 +0100)
commitde9cba4dc7bb98a579cf5df1f9900e9328544871
treede2cd09379c3fc9aece0f7de7724b7979b2413ca
parent512097deb083d5c2b3eccfe156652d8a75b4ad76
parentbd812185717e3554a02f4d405c377c68bc3cdef9
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/templates/institution.html
portal/templates/institution.html