Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 13 Apr 2015 16:21:38 +0000 (18:21 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 13 Apr 2015 16:21:38 +0000 (18:21 +0200)
commit38246e458d7376845f110d5dbfcc4d8ae874f277
tree5726354456a83810b08b65962c5404e453874941
parent6df317a72253c8f590630a331a4576784959d3e9
parent69894313781f00267451de0266c7e31739bb483c
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/accountview.py
portal/accountview.py