git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0120bc4)
Merge branch 'master' into newnames
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 13 Nov 2013 07:08:36 +0000 (08:08 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 13 Nov 2013 07:08:36 +0000 (08:08 +0100)
Conflicts:
portal/templates/validate_pending.html


No differences found
myslice (django)