Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: arangod/VocBase/document-collection.c arangosh/CMakeLists.txt js/apps/system/aardvark/test/karma/karma.conf.js		2014-02-18 08:50:27 +01:00
..
bootstrap	fixed jslint warnings	2014-02-17 11:21:01 +01:00
modules	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
test-data	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
tests	updated tests	2014-02-14 18:44:36 +01:00