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)
Conflicts:
portal/templates/institution.html


No differences found