borrado index.html de fr
Merge branch 'dev' of https://github.com/GeographicaGS/Alboran into dev
a
api.wsgi
pull master
pull
Merge branch 'dev'
Merge branch 'dev' of https://github.com/GeographicaGS/Alboran into dev
Merge branch 'dev'
Merge branch 'master' of https://github.com/GeographicaGS/Alboran
Merge branch 'master' of https://github.com/GeographicaGS/Alboran
Merge branch 'master' of https://github.com/GeographicaGS/Alboran
Merge branch 'master' of https://github.com/GeographicaGS/Alboran
ajustes
Merge branch 'dev' of https://github.com/GeographicaGS/Alboran into dev
Merge branch 'dev'
Merge branch 'master' of https://github.com/GeographicaGS/Alboran
Merge branch 'master' of https://github.com/GeographicaGS/Alboran
Merge branch 'master' of https://github.com/GeographicaGS/Alboran
Merge branch 'master' of https://github.com/GeographicaGS/Alboran