Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app
Showing
File deleted
fuel/app/classes/controller/perfil/index.php
0 → 100644
fuel/app/classes/controller/receta/index.php
0 → 100644
fuel/app/logs/2018/11/28.php
0 → 100644
This diff is collapsed.
Click to expand it.
fuel/app/logs/2018/11/29.php
0 → 100644
fuel/app/logs/2018/11/30.php
0 → 100644
This diff is collapsed.
Click to expand it.
fuel/app/views/articulo/index.twig
0 → 100644
fuel/app/views/boletinsaludable/index.twig
0 → 100644
fuel/app/views/boletinsaludable/list.twig
0 → 100644
fuel/app/views/menupersonalizado/index.twig
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
fuel/app/views/perfil/datos_generales.twig
0 → 100644
fuel/app/views/perfil/index.twig
0 → 100644
fuel/app/views/perfil/switches.twig
0 → 100644
fuel/app/views/receta/content.twig
0 → 100644
fuel/app/views/receta/index.twig
0 → 100644
fuel/app/views/receta/tables.twig
0 → 100644
fuel/app/views/recetario/filters.twig
0 → 100644
fuel/app/views/recetario/index.twig
0 → 100644
fuel/app/views/recetario/list.twig
0 → 100644
This diff is collapsed.
Click to expand it.
public/assets/css/style.min.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/assets/img/articulo/articulo.jpg
0 → 100644
531 KB
10.3 KB
14.4 KB
public/assets/img/home/menus_saludables.png
0 → 100644
9.38 KB
public/assets/img/home/perfil.png
0 → 100644
7.86 KB
public/assets/img/home/perfil2.png
0 → 100644
20 KB
public/assets/img/home/perfil3.png
0 → 100644
21.4 KB
public/assets/img/home/trivial.png
0 → 100644
12 KB
public/assets/img/receta/receta.jpg
0 → 100644
798 KB
File deleted
public/assets/js/main.js
0 → 100644
public/assets/js/recetario/index.js
0 → 100644
File added
File added
File added
This diff is collapsed.
Click to expand it.
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
2.34 KB
3.55 KB
2.64 KB
2.56 KB
2.73 KB
2.65 KB
2.45 KB
2.34 KB
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.