git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: f8a614d)
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


No differences found
myslice (django)