Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre fibre
authorRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Tue, 14 Jul 2015 18:26:50 +0000 (15:26 -0300)
committerRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Tue, 14 Jul 2015 18:26:50 +0000 (15:26 -0300)
commitbb98f1e7f4d1d2692b0405377c8f7c7466d72aee
treeefdf068696dc6244db1a730f85a88ef2ac4ed696
parent22d09f122df0baa7f9d033e687b0422ea12b0e07
parentc4cd92983e234a85010b3d4079013619709251ad
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/homeview.py
portal/actions.py
portal/homeview.py
portal/templates/fibre/fibre_institution.html