Frank Celler 77f544a554 Merge pull request #1144 from triAGENS/less-confusing-http-naming ... Renamed mergeArrays->mergeObjects (because it's actually about objects, not arrays)		2014-12-03 14:48:04 +01:00
..
api-docs	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-11-14 18:38:19 +01:00
clusterFrontend	Removed JSLint warning in Frontend	2014-11-06 13:41:12 +00:00
frontend	Merge pull request #1144 from triAGENS/less-confusing-http-naming	2014-12-03 14:48:04 +01:00
lib	Reverted my changes for Swagger URL Export	2014-11-05 16:25:21 +00:00
repositories	…
test	Fixed document view tests	2014-11-06 14:54:11 +00:00
aardvark.js	issue #1103: Error while importing user queries	2014-11-18 09:14:27 +01:00
api-docs.json	release version 2.3.0-beta2	2014-11-07 19:38:08 +01:00
cluster.js	…
favicon.ico	…
index.html	…
manifest.json	Removed unused frontend libraries ColVis and dataTables	2014-11-28 16:38:25 +01:00
statistics.js	…