Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:03:17 +0000 (16:03 -0200)
committerRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:03:17 +0000 (16:03 -0200)
commit052b44c985ff063d058a2958b097fe3eff03fce1
treed95b3379e78881f233f6f0492601e8712a79a9e6
parent5909aecc8959015bc217498d1ef8e8748f7c8087
parentd9c4cf9cd7f3269068e048563b2975d26af2ae70
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
portal/actions.py
portal/homeview.py