Carlos Jimenez Ruiz 2ba91a6cc2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev		2019-04-05 13:20:47 +02:00
..
back	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-05 13:20:47 +02:00
front	#1300-1301 client.risk	2019-04-05 13:20:34 +02:00