gschwab a205a49f1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: js/apps/system/aardvark/frontend/js/views/graphManagementView.js		2014-06-26 15:57:53 +02:00
..
bootstrap	fixed printing of functions and example generation	2014-06-24 15:32:43 +02:00
modules	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2014-06-26 15:57:53 +02:00
test-data	added empty remark	2014-05-08 11:18:08 +02:00
tests	increased wait time	2014-06-26 13:18:30 +02:00