git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a148aba 7ac6b8a)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Oct 2013 15:37:00 +0000 (17:37 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Oct 2013 15:37:00 +0000 (17:37 +0200)

Trivial merge
myslice (django)