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	nullptr	2014-06-27 23:58:13 +02:00
RestBatchHandler.h	updated disclaimer	2014-06-20 16:40:35 +02:00
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	renamed variable	2014-08-15 18:12:58 +02:00
RestEdgeHandler.h	updated disclaimer	2014-06-20 16:40:35 +02:00
RestImportHandler.cpp	fixed examples	2014-06-24 11:26:51 +02:00
RestImportHandler.h	updated disclaimer	2014-06-20 16:40:35 +02:00
RestPleaseUpgradeHandler.cpp	updated disclaimer	2014-06-20 16:40:35 +02:00
RestPleaseUpgradeHandler.h	updated disclaimer	2014-06-20 16:40:35 +02:00
RestReplicationHandler.cpp	removed unused function argument	2014-08-23 00:50:37 +02:00
RestReplicationHandler.h	simplification of signatures	2014-06-24 00:32:40 +02:00
RestUploadHandler.cpp	updated disclaimer	2014-06-20 16:40:35 +02:00
RestUploadHandler.h	updated disclaimer	2014-06-20 16:40:35 +02:00
RestVocbaseBaseHandler.cpp	removed unused function argument	2014-08-23 00:50:37 +02:00
RestVocbaseBaseHandler.h	Sort out TRI_CompareValuesJson to use UTF8 on demand.	2014-08-13 14:22:05 +02:00