Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic & Edelberto <loic.baron@lip6.fr>
Thu, 13 Mar 2014 13:40:28 +0000 (10:40 -0300)
committerLoic & Edelberto <loic.baron@lip6.fr>
Thu, 13 Mar 2014 13:40:28 +0000 (10:40 -0300)
commit17b63c6cadb1f641b328abadd2ca9c0cf34122f2
tree8fe23e1d4b9a7bb584c4cb5bbf0461e2d5f99723
parent93292c5ec48fd2925af2ce179a60262b948a44ac
parentdaca068fb37ae7e64d9c0559b96a79e6a3f4bb98
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/actions.py
myslice/urls.py
portal/actions.py
ui/templates/base.html
ui/templates/messages-transient-header.html