Frank Celler a4264bfa1e Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 ... Conflicts: VERSION js/apps/system/aardvark/api-docs.json js/apps/system/aardvark/api-docs/batch.json js/apps/system/aardvark/api-docs/collection.json js/apps/system/aardvark/api-docs/cursor.json js/apps/system/aardvark/api-docs/database.json js/apps/system/aardvark/api-docs/document.json js/apps/system/aardvark/api-docs/edge.json js/apps/system/aardvark/api-docs/edges.json js/apps/system/aardvark/api-docs/endpoint.json js/apps/system/aardvark/api-docs/explain.json js/apps/system/aardvark/api-docs/graph.json js/apps/system/aardvark/api-docs/index.json js/apps/system/aardvark/api-docs/query.json js/apps/system/aardvark/api-docs/replication.json js/apps/system/aardvark/api-docs/simple.json js/apps/system/aardvark/api-docs/system.json js/apps/system/aardvark/api-docs/transaction.json js/apps/system/aardvark/api-docs/traversal.json js/apps/system/aardvark/api-docs/user.json js/apps/system/aardvark/api-docs/version.json js/apps/system/aardvark/frontend/js/bootstrap/errors.js js/common/bootstrap/errors.js js/server/modules/org/arangodb/testing.js		2014-10-29 12:22:48 +01:00
..
bootstrap	issue #1059: Bug in js module console	2014-10-25 00:04:39 +02:00
modules	fixed usage of AQL user-defined functions from web UI	2014-10-27 11:09:20 +01:00
test-data	…
tests	Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3	2014-10-29 12:22:48 +01:00