git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 558f83a 6d69d05)
Merge branch 'master' into newnames
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Nov 2013 14:35:01 +0000 (15:35 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Nov 2013 14:35:01 +0000 (15:35 +0100)
Conflicts:
ui/topmenu.py

1  2 
unfold/static/css/onelab_marko.css patch | diff1 | diff2 | blob | history

diff --cc unfold/static/css/onelab_marko.css
Simple merge
myslice (django)