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)
commit2b1ae67a6922ed97c96d22dc78090a8aea2c3a4d
treed585d4f965056d67d71656a4936b513a7b7e5682
parent47c1017ecb82f8880e56565fb0f2eb7e7baccc5b
parentd4e1a95cb427ce0960874b040532edbf0ee6b629
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py