Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 25 Oct 2013 16:01:54 +0000 (18:01 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 25 Oct 2013 16:01:54 +0000 (18:01 +0200)
commit0c8a634162f3271018102e75a3934c5db5e48f59
tree0e77eadb3a6d269e4bac3a7edb08ee1f9fe9f8b9
parent491bd4d5497b5c431ab35716425f4c95fd2c3696
parent01444db8baee1c4dfecc41dd89ca8a9aab0df38e
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
manifold/manifoldapi.py
myslice/myslice.ini.localhost
portal/templates/registration_view.html