Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 16:09:54 +0000 (18:09 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 16:09:54 +0000 (18:09 +0200)
1  2 
portal/views.py

diff --cc portal/views.py
Simple merge