Carlos Jimenez Ruiz 73ccf9a107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev		2019-06-19 14:42:59 +02:00
..
en.json	#1537 refactor fixtures + e2e fixes	2019-06-19 09:03:45 +02:00
es.json	Merge with master	2019-06-17 11:33:34 +02:00