git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e1d40e edd95f4)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 23 Nov 2015 17:22:37 +0000 (18:22 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 23 Nov 2015 17:22:37 +0000 (18:22 +0100)
1  2 
manifoldapi/static/js/manifold.js patch | diff1 | diff2 | blob | history

diff --cc manifoldapi/static/js/manifold.js
Simple merge
myslice (django)