7 Commits

Author	SHA1	Message	Date
Eduardo Arango	9f97da0956	resolve merge conflicts ... Signed-off-by: Eduardo Arango <eduardo@sylabs.io>	2019-04-16 17:01:22 -05:00
Eduardo Arango	bd0d641a5e	address @cgbaker comments ... Signed-off-by: Eduardo Arango <eduardo@sylabs.io>	2019-04-16 16:59:59 -05:00
Chris Baker	8b980f98d2	Update singularity.html.md	2019-04-15 09:49:30 -04:00
Eduardo Arango	e7ee1f65fc	Merge branch 'website_docs_singularity' of github.com:ArangoGutierrez/nomad into website_docs_singularity	2019-04-12 16:27:33 -05:00
Eduardo Arango	62094263be	address requestec changes, iteration 1 ... Signed-off-by: Eduardo Arango <eduardo@sylabs.io>	2019-04-12 16:26:52 -05:00
Chris Baker	e6da05276c	minor typographical changes	2019-04-12 15:05:56 -04:00
Eduardo Arango	42f867aa54	list singularity as a community driver ... Signed-off-by: Eduardo Arango <eduardo@sylabs.io>	2019-04-12 12:59:31 -05:00