merda mc
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into joan
Presentació
afegit vista
gestor
Presentació
provaaaa
2
Revert "2"

This reverts commit 776474df012e9563808d22c8718ad74280235006.
la he liat molt
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS
Merge branch 'josep' of https://github.com/carlosep93/PROP_CAMIONS
Merge branch 'josep' of https://github.com/carlosep93/PROP_CAMIONS into pol
capa_presentació
Merge branch 'pol'
Presentació
capa presentacio
cuadrados y lineas
city
Merge branch 'joan' of https://github.com/carlosep93/PROP_CAMIONS into joan