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
..
bootstrap	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
modules	updated tests and documentation	2014-02-06 12:11:17 +01:00
test-data	fix require bug for modules	2013-09-20 17:46:07 +02:00
tests	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00