Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 29 Jul 2013 03:42:55 +0000 (05:42 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 29 Jul 2013 03:42:55 +0000 (05:42 +0200)
commitc0c7175e6883ad9bc746692e7c71202e64ec2351
treeed1492d1985488768283d12e5176471878b26bd9
parent4e348dd653e2f7124550f153a30744293eab3b2f
parente33ccb0d215722ca404f3fde37f7a9c83e41ab0b
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py