Carlos Jimenez Ruiz 7d0c42c077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev		2019-06-20 14:41:58 +02:00
..
back	#1517 ticket.index	2019-06-20 14:35:47 +02:00
front	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-20 14:41:58 +02:00