Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Feb 2013 14:09:20 +0000 (15:09 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Feb 2013 14:09:20 +0000 (15:09 +0100)
commitde93a901d06d0f4f666ff0fcafd1fa024da144e1
tree53f8dde7137e6593e9f10dc2e5200a3b77728133
parent8247ee9b8c0108bfe23a677485172950b0a2eed5
parent7484468cd960cad3b006958369dcfc8682aade91
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django

Conflicts:
templates/view-login.html
templates/view-login.html