git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4e4119 c3ea005)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorroot <root@Portable>
Tue, 4 Mar 2014 18:02:45 +0000 (19:02 +0100)
committerroot <root@Portable>
Tue, 4 Mar 2014 18:02:45 +0000 (19:02 +0100)
1  2 
portal/static/js/myslice-ui.js patch | diff1 | diff2 | blob | history

diff --cc portal/static/js/myslice-ui.js
Simple merge
myslice (django)