Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # scripts/startLocalCluster.sh		2016-12-09 14:30:19 +01: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 https://github.com/arangodb/arangodb into devel	2016-12-09 14:30:19 +01:00
tests	general transactions in agency comm	2016-11-25 09:24:41 +01:00
client.js	Implement process.stdout.isTTY	2016-11-19 18:42:29 +01:00