Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: CHANGELOG js/apps/system/aardvark/frontend/css/collectionsItemView.css js/apps/system/aardvark/frontend/css/graphlayout.css		2014-02-06 13:18:52 +01:00
..
errors.js	updated tests and documentation	2014-02-06 12:11:17 +01:00
module-console.js	updated documentation for console, added section about Foxx development	2013-10-17 13:09:39 +02:00
module-fs.js	Add fs.makeAbsolute needed by kickstarter.	2014-02-04 11:36:28 +01:00
module-internal.js	removed unused variable	2014-02-02 09:21:43 +01:00
modules.js	follow up for issue #738	2014-01-17 22:58:43 +01:00
monkeypatches.js	…