Michael Hackstein cff6bd9380 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: js/common/modules/org/arangodb/general-graph.js		2014-06-23 15:15:18 +02:00
..
actions	fixed examples for rotate	2014-06-20 23:39:32 +02:00
apps/system	docu	2014-06-23 15:14:16 +02:00
client	hidden for http examples	2014-06-23 14:04:16 +02:00
common	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-06-23 15:15:18 +02:00
node	Move `util` to node, because it is only used there	2014-06-20 16:40:33 +02:00
server	Some changes in the documentation code	2014-06-23 14:55:14 +02:00
GUIDELINES.md	…
Makefile.files	fixed bug in commonPorperties, now attributes with the value of 'false' are included in result, fixed js shell to full general-graph support	2014-06-23 11:37:43 +02:00