Simon Grätzer e0e00b0b6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api ... # Conflicts: # arangod/RocksDBEngine/RocksDBEdgeIndex.cpp		2017-04-13 17:48:52 +02:00
..
actions	fixed require	2017-03-16 15:19:41 +01:00
apps/system	fixed event ui bug	2017-04-11 10:58:59 +02:00
client	Merge branch 'devel' of github.com:arangodb/arangodb into engine-api	2017-04-13 17:34:25 +02:00
common	Fixing tests	2017-04-13 17:45:16 +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-13 17:48:52 +02:00
.eslintrc	added rule to eslint conf	2016-11-15 14:40:21 +01:00
.jshintrc	…
GUIDELINES.md	…