git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 572f5fd 041b91e)
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 6 Sep 2013 15:24:25 +0000 (17:24 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 6 Sep 2013 15:24:25 +0000 (17:24 +0200)

Trivial merge
myslice (django)