Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: js/apps/system/aardvark/test/karma/karma.conf.js		2013-12-20 15:35:50 +01:00
..
bootstrap	removed unused variables	2013-11-18 11:22:09 +01:00
modules/org	better clone some objects returned by AQL user-defined functions	2013-12-04 22:05:54 +01:00
tests	Merge remote-tracking branch 'origin/devel' into sharding	2013-12-20 15:35:50 +01:00
arango-dfdb.js	removed unused variables	2013-11-18 11:22:09 +01:00
server.js	…
version-check.js	fixed user creation on database creation	2013-11-07 13:32:42 +01:00