nelo 98dada7c8c Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix ... # Conflicts: # @salix/crud/src/client/basic-data/index.html		2016-12-15 16:57:28 +01:00
..
src	Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix	2016-12-15 16:57:28 +01:00
.gitignore	Initial commit	2016-09-29 07:10:58 +02:00
index.js	Estilos	2016-11-23 17:25:19 +01:00
package.json	Plantilla proyecto inicial	2016-09-29 11:04:11 +02:00