Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Thu, 16 Jan 2014 16:38:29 +0000 (17:38 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 16 Jan 2014 16:38:29 +0000 (17:38 +0100)
commit6525a09c12184206e7e90578d2e48d9b15006dba
tree048a7184b1d0946343e334f9cd183f68e4e1252b
parent7114aa9ee7ecf6e245c58b55c73eac455a6be53b
parent1e68ec413db233604adef3e84d5bc94ef30cd9f9
Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
portal/templates/registration_view.html
portal/registrationview.py
portal/templates/slicerequest_view.html