Juan Ferrer Toribio c4cb0906ad Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev		2017-05-18 17:35:51 +02:00
..
common	Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev	2017-05-18 17:35:51 +02:00
server	Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev	2017-05-18 17:35:51 +02:00
.gitignore	Script arranque, @salix-services renombrado	2016-11-18 14:12:57 +01:00
.yo-rc.json	Script arranque, @salix-services renombrado	2016-11-18 14:12:57 +01:00
Dockerfile	Jenkins - Docker	2017-05-12 12:41:35 +02:00
package.json	Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix	2017-04-28 15:04:36 +02:00