Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: lib/ShapedJson/Legends.cpp lib/ShapedJson/Legends.h		2014-05-20 17:03:49 +02:00
..
actions	adjusted all require(org/arangodb/graph) to new graph-blueprint module	2014-05-15 10:33:20 +02:00
apps/system	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-05-20 17:03:49 +02:00
client	make test restartable	2014-05-17 13:13:30 +02:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-05-20 17:03:49 +02:00
node	fix coffee script parse error error	2014-03-04 18:45:40 +01:00
server	added GRAPH_NEIGHBORS	2014-05-20 16:45:22 +02:00
GUIDELINES.md	…
Makefile.files	fixed return value of `make jslint`	2014-03-10 09:37:23 +01:00