Jan Steemann 6845321737 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... Conflicts: js/server/tests/shell-foxx-manager-spec.js		2015-08-13 13:21:55 +02:00
..
actions	Add a @brief to all descriptions, remove stray markup.	2015-08-12 16:58:06 +02:00
apps/system	issue #1434: return more meaningful error message from org/arangodb/general-graph::_fromVertex()	2015-08-12 21:36:27 +02:00
client	Revert "added updateDeps"	2015-08-10 14:56:01 +02:00
common	Merge branch 'devel' of github.com:arangodb/arangodb into devel	2015-08-13 11:22:12 +02:00
contrib	Add some graph generators and a CSV_exporter.	2015-04-25 21:46:23 -07:00
node	Added highlight.js	2015-07-21 14:46:43 +02:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2015-08-13 13:21:55 +02:00
.jshintrc	Linting.	2015-06-16 14:54:14 +02:00
GUIDELINES.md	refactored cursor API	2015-03-30 14:58:51 +02:00
Makefile.files	added missing files for web interface	2015-04-03 15:01:12 +02:00