Jan Steemann 2aba046c7d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding		2014-01-14 16:21:57 +01:00
..
actions	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-14 13:29:07 +01:00
apps/system/aardvark	Fixed merge confilct	2014-01-14 15:01:17 +01:00
client	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-10 17:41:52 +01:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-14 13:29:07 +01:00
node	added coffee-script	2013-04-21 22:57:19 +02:00
npm	added sinon, upgraded underscore and coffe-script	2013-09-20 17:46:52 +02:00
server	create collection stub	2014-01-14 16:21:48 +01:00
GUIDELINES.md	fixed typos	2013-01-18 17:10:24 +01:00
Makefile.files	removed redundant startup options	2013-11-20 01:50:27 +01:00