Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api		2017-04-13 17:34:25 +02:00
..
assets/queuetest	Improve clusterawareness in foxx and foxx queues	2016-08-10 12:26:24 +02:00
bootstrap/modules	Reformat code	2016-06-30 16:57:17 +02:00
modules/@arangodb	Merge branch 'devel' of github.com:arangodb/arangodb into engine-api	2017-04-13 17:34:25 +02:00
tests	Foxx: Fix arangoUser not being set correctly	2017-03-29 17:33:16 +02:00
client.js	Use COLOR_OUTPUT to determine whether to use color	2017-03-15 20:44:03 +01:00