git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: bfaf128)
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 12:37:42 +0000 (14:37 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 12:37:42 +0000 (14:37 +0200)
Conflicts:
portal/urls.py


No differences found
myslice (django)