git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f6ce93 a550a07)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 11 Oct 2013 15:28:57 +0000 (17:28 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 11 Oct 2013 15:28:57 +0000 (17:28 +0200)
1  2 
portal/sliceview.py patch | diff1 | diff2 | blob | history

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