git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: de93a90)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Feb 2013 14:09:20 +0000 (15:09 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 12 Feb 2013 14:09:20 +0000 (15:09 +0100)
Conflicts:
templates/view-login.html


No differences found
myslice (django)