Jan Steemann 7a3d49be88 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel		2015-08-04 10:30:28 +02:00
..
actions	try to fix example	2015-08-03 10:54:49 +02:00
apps/system	de-duplicate documentation of geo-indices.	2015-08-03 14:42:11 +02:00
client	removed locks	2015-07-21 17:34:57 +02:00
common	remove the endDocuBlock of the broken documentation too.	2015-08-03 16:45:41 +02:00
contrib	…
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-04 10:30:28 +02:00
.jshintrc	…
GUIDELINES.md	…
Makefile.files	…