Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH ... Conflicts: arangod/Agency/Constituent.cpp arangod/Agency/RestAgencyHandler.cpp arangod/Aql/Query.cpp arangod/Aql/grammar.cpp arangod/RestHandler/RestSimpleQueryHandler.cpp arangod/RestServer/ArangoServer.cpp js/client/modules/@arangodb/testing.js		2016-04-19 07:44:00 +02:00
..
Basics	fixed inclusion of removed file	2016-04-18 18:04:20 +02:00
Geo	…
HttpInterface	standalone.html -> index.html	2016-04-18 18:01:05 +02:00
CMakeLists.txt	…
server.pem	…
unittest.js	WIP	2016-04-16 18:44:10 -07:00