git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58f9c1b 1e75b6c)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 15:35:46 +0000 (16:35 +0100)
committerMohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Fri, 21 Dec 2012 15:35:46 +0000 (16:35 +0100)

Trivial merge
myslice (django)