Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # arangod/Aql/FunctionDefinitions.cpp # arangod/Aql/Functions.h # arangod/Utils/ExplicitTransaction.h		2017-02-10 15:21:24 +01:00
..
assets/queuetest	…
bootstrap/modules	…
modules/@arangodb	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 15:21:24 +01:00
tests	Fixed test	2017-01-31 14:13:58 +01:00
client.js	Implement process.stdout.isTTY	2016-11-19 18:42:29 +01:00