Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 2 Aug 2013 08:07:56 +0000 (10:07 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 2 Aug 2013 08:07:56 +0000 (10:07 +0200)
1  2 
portal/views.py

diff --cc portal/views.py
Simple merge