git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 491bd4d 01444db)
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)
1  2 
manifold/manifoldapi.py patch | diff1 | diff2 | blob | history
myslice/myslice.ini.localhost patch | diff1 | diff2 | blob | history
portal/templates/registration_view.html patch | diff1 | diff2 | blob | history

diff --cc manifold/manifoldapi.py
Simple merge
diff --cc myslice/myslice.ini.localhost
Simple merge
myslice (django)