Juan Ferrer 4436acec10 Merge		2019-11-14 14:07:48 +01:00
..
back	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-11-13 08:09:54 +01:00
front	Merge	2019-11-14 14:07:48 +01:00