Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 26 Feb 2014 18:34:15 +0000 (19:34 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 26 Feb 2014 18:34:15 +0000 (19:34 +0100)
commitff6408f68dcb6231d5ad7941dc7db3d9cd9fa6bb
tree40ac3d20ec6e02f74c7b966c9e2b378ac8744cb7
parent09510a65d7518ae3996e7d87f021f88993878437
parentb809db2b2f87c67812b18ac1f1b75910c4168ea4
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
rest/__init__.py
portal/templates/institution.html
portal/templates/onelab/onelab_home-view.html
rest/__init__.py