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
..
actions	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
apps/system/aardvark	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
client	updated tests	2014-02-14 18:44:36 +01:00
common	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
devs/databases/_system	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
node	added node modules semver, numeral, moment, marked	2014-02-13 15:31:48 +01:00
server	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
GUIDELINES.md	…
Makefile.files	jslintified several tests	2014-02-01 01:50:58 +01:00