James 6e47660ff7 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or		2014-12-06 15:41:34 +00:00
..
actions	fixed paragraph issue	2014-12-03 09:55:25 +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	tests for index-or and in	2014-12-06 15:27:20 +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