nelo 440e9705d2 Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix ... # Conflicts: # @salix/crud/src/client/basic-data/index.html		2016-12-15 08:34:07 +01:00
..
client	Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix	2016-12-15 08:34:07 +01:00
crud.js	MT overrides, sin mayúsculas, botón naranja, rutas sin tags	2016-11-30 18:08:03 +01:00
module.js	descriptor en app	2016-12-01 08:37:43 +01:00