Juan Ferrer Toribio 041be5ec93 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev		2017-05-25 12:52:49 +02:00
..
auth	Integración usuarios, errores solucionados	2017-05-21 18:36:07 +02:00
client	Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev	2017-05-25 12:52:49 +02:00
core	Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev	2017-05-25 12:52:49 +02:00
salix	Separado aclService en fichero propio	2017-05-25 11:52:53 +02:00
vendor	Dependencia con uirouter actualizada	2017-05-25 12:34:03 +02:00