Jan Steemann aadd0f9254 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Utils/CollectionNameResolver.h arangod/V8Server/v8-vocbase.cpp		2014-08-30 17:35:08 +02:00
..
RestBatchHandler.cpp	…
RestBatchHandler.h	…
RestDocumentHandler.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-30 17:35:08 +02:00
RestDocumentHandler.h	added `type` option for `GET /_api/document?collection=...`	2014-08-30 17:26:24 +02:00
RestEdgeHandler.cpp	…
RestEdgeHandler.h	…
RestImportHandler.cpp	…
RestImportHandler.h	…
RestPleaseUpgradeHandler.cpp	…
RestPleaseUpgradeHandler.h	…
RestReplicationHandler.cpp	removed unused function argument	2014-08-23 00:50:37 +02:00
RestReplicationHandler.h	…
RestUploadHandler.cpp	…
RestUploadHandler.h	…
RestVocbaseBaseHandler.cpp	removed unused function argument	2014-08-23 00:50:37 +02:00
RestVocbaseBaseHandler.h	…