Carlos Jimenez Ruiz d109e480a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev		2019-01-31 14:14:52 +01:00
..
back	#1069 mostrar el nickname en los sitios donde aparezca nombre solo	2019-01-31 14:14:39 +01:00
front	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-31 14:14:52 +01:00