Merge branch 'master' into newnames
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 13 Nov 2013 07:08:36 +0000 (08:08 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 13 Nov 2013 07:08:36 +0000 (08:08 +0100)
commit0120bc491b3464f4981270a28ac153fa62f3b08b
tree6e80898bcdc9e54675ddec5b035679ea77a12930
parent5afb541f209f479b009e8305dd2626780cadcff9
parente6184193b74ac6d5c52289546dae9121bdd99008
Merge branch 'master' into newnames

Conflicts:
portal/templates/validate_pending.html
portal/templates/account-view.html
portal/templates/contact.html
portal/templates/home-view.html
portal/templates/registration_view.html
portal/templates/resource.html
portal/templates/slice-request-view.html
portal/templates/validate_pending.html
unfold/static/css/onelab_marko.css