Carlos Jimenez Ruiz 1f5fe891e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev		2019-04-17 07:16:13 +02:00
..
back	#1335 worker/filter renamed columns acordantly	2019-04-16 08:42:44 +02:00
front	#1306 Renombrar controladores, rutas y carpeta	2019-04-16 15:00:21 +02:00