Carlos Jimenez Ruiz 7333cb4114 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev		2019-01-27 20:49:21 +01:00
..
back	#1022 ticket.create	2019-01-25 11:58:50 +01:00
front	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-27 20:49:21 +01:00