Joan Sanchez d66fed5a3d Merge branch 'dev' of https://git.verdnatura.es/salix into dev		2017-10-17 09:01:51 +02:00
..
application	Respuesta json en peticiones, auth, escrito impresoras	2017-10-17 08:22:59 +02:00
.gitignore	arreglos de conflictos	2017-06-01 07:59:41 +02:00
Dockerfile	Docker Services	2017-08-30 09:58:10 +02:00
package.json	Eliminando código redundante v1	2017-10-11 15:36:47 +02:00
server.js	Merge branch 'dev' of https://git.verdnatura.es/salix into dev	2017-10-17 09:01:51 +02:00