Juan Ferrer ba62f545f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev		2019-02-22 16:17:08 +01:00
..
core	#1152 updated td-editable	2019-02-22 12:27:56 +01:00
salix	Style fixes	2019-02-22 16:15:54 +01:00
Dockerfile	vnSideMenu, vnBackground, style fixes	2019-02-05 09:13:15 +01:00
module-import.js	#998 worker.index	2019-01-28 16:24:45 +01:00
nginx.conf	docker scale 2 back containers	2019-02-07 08:03:23 +01:00
package-lock.json	#1060 añadir al componente check la popiedad intermediate	2019-02-14 20:17:22 +01:00
package.json	#1060 añadir al componente check la popiedad intermediate	2019-02-14 20:17:22 +01:00
test-index.js	#814 Docker & test	2019-01-04 13:32:04 +01:00