Simon Grätzer 36503af230 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # arangod/RocksDBEngine/RocksDBReplicationTailing.cpp		2017-05-24 18:38:34 +02:00
..
actions	fix getIndex(withStats) for arangosh	2017-05-17 13:50:03 +02:00
apps/system	new autogenerated files	2017-05-18 12:23:21 +02:00
client	fix test :S	2017-05-17 18:31:55 +02:00
common	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-05-24 18:38:34 +02:00
contrib	…
node	alphabetic order	2017-05-05 20:21:36 +02:00
server	Fix linter	2017-05-24 14:53:06 +02:00
.eslintrc	…
.jshintrc	…
GUIDELINES.md	…