Jan Steemann 48e3a5828c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: CHANGELOG		2014-01-31 11:31:09 +01:00
..
bootstrap	mount default apps in /system	2014-01-28 14:33:47 +01:00
modules/org	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-31 11:31:09 +01:00
tests	Rename sharding dir to cluster	2014-01-31 11:24:01 +01:00
arango-dfdb.js	removed unused variables	2013-11-18 11:22:09 +01:00
server.js	…
version-check.js	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-24 14:50:09 +01:00