Juan Ferrer Toribio 34e0537b64 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev		2017-05-12 13:36:56 +02:00
..
auth	Merge commit 'd93c6e18853e572c097b9f8fee4885b6ab17ebae' into dev	2017-05-12 13:05:54 +02:00
client	Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev	2017-05-12 13:36:56 +02:00
db	consignatario sin bind	2017-03-06 11:44:02 +01:00
nginx	docker nginx conf	2017-05-12 13:14:52 +02:00
salix	Jenkins - Docker	2017-05-12 12:41:35 +02:00