public/assets/css · db1a2742c2a80605fcce2a656f373782116e005c · inutralia / 2018_web_app · GitLab

History Find file

Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app · 467b57b4
```
# Conflicts:
#	fuel/app/classes/controller/listacompra/index.php
#	fuel/app/views/listacompra/index.twig
```
Luis Perez authored Dec 12, 2018
467b57b4

Name	Last commit	Last update
..
.DS_Store		Loading commit data...
animate.css		Loading commit data...
bootstrap.css		Loading commit data...
bootstrap.css.map		Loading commit data...
bootstrap.min.css		Loading commit data...
custom.css		Loading commit data...
menu_effect.css		Loading commit data...