6 Commits

Author	SHA1	Message	Date
Dani Herrero	342ca3bd30	arreglos de conflictos	2017-06-01 07:59:41 +02:00
Dani Herrero	25bac942a3	merge	2017-06-01 07:10:28 +02:00
Juan Ferrer Toribio	0c82c83ca3	Errores solucionados, configuración mailer, eslint	2017-05-31 18:19:55 +02:00
Joan Sanchez	552559adaa	Service mailer, plantillas y traducciones	2017-05-31 13:46:18 +02:00
Joan Sanchez	04aadb76a2	Service mailer	2017-05-30 08:06:14 +02:00
Joan Sanchez	609c13efbf	Service mailer	2017-05-30 08:06:14 +02:00