Merge branch 'master' into dev_villa
# Conflicts: # fuel/app/views/perfil/datos_generales.twig # fuel/app/views/perfil/index.twig
Showing
fuel/app/logs/2018/11/30.php
deleted
100644 → 0
fuel/app/views/layout/menu_dashboard.twig
0 → 100644
fuel/app/views/listacompra/index.twig
0 → 100644
5.31 KB
public/assets/img/logos/inutralia_big.png
0 → 100644
27.2 KB