git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60437a0 ad35ed3)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 6 Dec 2013 16:20:30 +0000 (17:20 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 6 Dec 2013 16:20:30 +0000 (17:20 +0100)
1  2 
manifold/manifoldapi.py patch | diff1 | diff2 | blob | history
portal/sliceview.py patch | diff1 | diff2 | blob | history

diff --cc manifold/manifoldapi.py
Simple merge
diff --cc portal/sliceview.py
Simple merge
myslice (django)