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
..
actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 15:21:24 +01:00
apps/system	Merge branch 'devel' of github.com:arangodb/arangodb into devel	2017-02-09 14:01:20 +01:00
client	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 15:21:24 +01:00
common	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 15:21:24 +01:00
contrib	…
node	Add ansi-html, babel-code-frame, chalk	2017-01-27 01:57:29 +01:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-10 15:21:24 +01:00
.eslintrc	added rule to eslint conf	2016-11-15 14:40:21 +01:00
.jshintrc	…
GUIDELINES.md	…