git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cbd1a5 5a98d2b)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 11 Oct 2013 19:24:51 +0000 (21:24 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 11 Oct 2013 19:24:51 +0000 (21:24 +0200)
Conflicts:
portal/urls.py


Trivial merge
myslice (django)