menu tipo html
menu tipo html
Merge origin/master

Conflicts:
	application/controllers/tipo.php
rediseño de login
crear y eliminar menus
crear y eliminar menus
proyecto
Merge origin/master

Conflicts:
	application/controllers/clients.php
	application/controllers/submenu.php
	application/controllers/tipo.php
	application/models/submenu_model.php
	application/views/submenu/botonera.php
submenus
submenus
submenus
proyecto