James 0646a5a98e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or ... Conflicts: CHANGELOG arangod/Aql/ExecutionBlock.cpp arangod/Aql/OptimizerRules.cpp arangod/Aql/grammar.cpp js/server/tests/aql-optimizer-indexes.js		2014-12-02 10:42:04 +00:00
..
actions	issue #1109: added *bytes* unit to API description where missing	2014-11-28 17:46:42 +01:00
apps/system	release version 2.3.1	2014-11-28 20:01:19 +01:00
client	Revert "More error output if update() in foxx manager fails."	2014-11-28 17:56:53 +01:00
common	Clarify whether the test is running via arangosh or arangod.	2014-12-01 14:21:00 +01:00
node	Updated joi to 4.9.0.	2014-11-28 17:52:31 +01:00
server	Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or	2014-12-02 10:42:04 +00:00
.jshintrc	…
GUIDELINES.md	…
Makefile.files	…