git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9eb4ac5 e5ff999)
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 10:57:01 +0000 (12:57 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 10:57:01 +0000 (12:57 +0200)
1  2 
portal/views.py patch | diff1 | diff2 | blob | history

diff --cc portal/views.py
Simple merge
myslice (django)