Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # 3rdParty/V8/v8 # arangod/Transaction/Methods.h # arangod/Utils/UserTransaction.h # arangod/V8Server/v8-collection.cpp		2017-03-01 14:52:35 +01:00
..
actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-01 14:52:35 +01:00
apps/system	grunt build	2017-02-17 11:24:29 +01:00
client	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-01 14:52:35 +01:00
common	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-01 14:52:35 +01:00
contrib	…
node	arangoexport: added test for xgmml, node module xmldom	2017-02-28 15:25:18 +01:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-01 14:52:35 +01:00
.eslintrc	…
.jshintrc	…
GUIDELINES.md	…