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
..
app	Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix	2016-12-15 16:57:28 +01:00
core	Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix	2016-12-15 16:57:28 +01:00
crud	Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix	2016-12-15 16:57:28 +01:00
login	Angular translate incluido, Componentes core traducibles	2016-12-15 13:57:45 +01:00
vendor	Angular translate incluido, Componentes core traducibles	2016-12-15 13:57:45 +01:00
.gitignore	client	2016-11-22 13:20:44 +01:00
gulpfile.js	file.relative solucionado	2016-12-15 11:26:15 +01:00
package.json	Angular translate incluido, Componentes core traducibles	2016-12-15 13:57:45 +01:00
webpack.config.js	modificaciones para hacer el pull	2016-12-15 08:31:15 +01:00