James 40a67f47c7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or ... Conflicts: arangod/Aql/ExecutionBlock.cpp arangod/Aql/OptimizerRules.cpp		2014-11-27 09:25:43 +00:00
..
actions	Fixed some dead links in the documentation	2014-11-21 09:13:50 +01:00
apps/system	fixed never-disappearing "query is operating" display	2014-11-26 10:50:03 +01:00
client	Fixing collection help output misspelled errors	2014-11-20 09:36:06 +01:00
common	fixed tests	2014-11-24 12:55:49 +01:00
node	Updated joi to 4.9.0.	2014-11-26 15:53:47 +01:00
server	Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or	2014-11-27 09:25:43 +00:00
.jshintrc	Enabled unused: true, ported aardvark jslint to jshint.	2014-09-02 22:18:18 +02:00
GUIDELINES.md	…
Makefile.files	added scripts to automatic testing	2014-10-30 00:46:58 +01:00