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	use `--data-binary` instead of `--data` in curl examples	2014-01-03 12:12:54 +01:00
modules/org	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-31 11:31:09 +01:00
tests	jslintified several tests	2014-02-01 01:50:58 +01:00
client.js	fixed issue #701: ArangoStatement undefined in arangosh	2013-12-02 09:53:49 +01:00