Jan Christoph Uhde 4c4d491eac Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api ... * 'engine-api' of https://github.com/arangodb/arangodb: Fixing transaction-no-commit Fixing create collections		2017-04-11 15:04:14 +02:00
..
actions	fixed require	2017-03-16 15:19:41 +01:00
apps/system	fixed issue: #2412	2017-04-06 13:31:44 +02:00
client	enable logtopic development for recovery tests	2017-04-11 15:03:13 +02:00
common	fix shell-foxx-manager-nightly-spec.js	2017-04-06 17:32:49 +02:00
contrib	…
node	updated licenses, added generator	2017-04-02 15:19:33 +02:00
server	Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api	2017-04-11 13:42:15 +02:00
.eslintrc	added rule to eslint conf	2016-11-15 14:40:21 +01:00
.jshintrc	…
GUIDELINES.md	…