git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd667c5 3155845)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 21 Aug 2014 16:31:36 +0000 (18:31 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 21 Aug 2014 16:31:36 +0000 (18:31 +0200)

Trivial merge
myslice (django)