git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6e8f84 91a1b08)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 24 Sep 2013 16:25:15 +0000 (18:25 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 24 Sep 2013 16:25:15 +0000 (18:25 +0200)

Trivial merge
myslice (django)