Jan Steemann 658294ecb3 fixed file with conflicts		2014-05-12 17:22:09 +02:00
..
actions	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-05-12 00:07:46 +02:00
apps/system	fixed file with conflicts	2014-05-12 17:22:09 +02:00
client	issue #839: Foxx Manager missing "unfetch"	2014-04-23 15:09:03 +02:00
common	fixed file with conflicts	2014-05-12 17:22:09 +02:00
node	…
server	added more delay for busy workers	2014-05-10 02:34:18 +02:00
GUIDELINES.md	…
Makefile.files	…