Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 2 Aug 2013 15:49:35 +0000 (17:49 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 2 Aug 2013 15:49:35 +0000 (17:49 +0200)
1  2 
portal/views.py

diff --cc portal/views.py
Simple merge