gschwab 55c494c81d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: js/common/modules/org/arangodb/general-graph.js		2014-05-16 16:12:40 +02:00
..
actions	adjusted all require(org/arangodb/graph) to new graph-blueprint module	2014-05-15 10:33:20 +02:00
apps/system	fixed collections logs spec	2014-05-16 15:35:56 +02:00
client	adjusted all require(org/arangodb/graph) to new graph-blueprint module	2014-05-15 10:33:20 +02:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2014-05-16 16:12:40 +02:00
node	fix coffee script parse error error	2014-03-04 18:45:40 +01:00
server	giving up	2014-05-15 16:28:14 +02:00
GUIDELINES.md	…
Makefile.files	fixed return value of `make jslint`	2014-03-10 09:37:23 +01:00