Simon Grätzer 3b7ef439c8 Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/rocksdb-geoindex		2017-05-09 17:42:27 +02:00
..
bootstrap	Merge remote-tracking branch 'origin/devel' into feature/ldap-auth	2017-04-24 15:37:18 +02:00
modules	db._explain should now be backwards-compatible if we access a 3.1 instance with a 3.2 arangosh	2017-04-26 11:01:05 +02:00
test-data	fix shell-foxx-manager-nightly-spec.js	2017-04-06 17:32:49 +02:00
tests	Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/rocksdb-geoindex	2017-05-09 17:42:27 +02:00