Jan Steemann 1f83842621 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel		2015-06-18 16:04:05 +02:00
..
actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2015-06-18 15:35:28 +02:00
apps/system	added generated files	2015-06-18 15:42:57 +02:00
client	Fixed #1268 regression.	2015-06-16 10:14:47 +02:00
common	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2015-06-18 16:04:05 +02:00
contrib	…
node	adjusted links	2015-06-05 10:08:52 +02:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2015-06-18 14:04:43 +02:00
.jshintrc	Linting.	2015-06-16 14:54:14 +02:00
GUIDELINES.md	…
Makefile.files	…