Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: lib/BasicsC/voc-errors.h		2014-08-22 21:51:38 +02:00
..
actions	Json: add HTTP-Entrypoint into Javascript deserialisation.	2014-08-20 17:08:06 +02:00
apps/system	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-22 21:51:38 +02:00
client	…
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-22 21:51:38 +02:00
node	…
server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-22 21:51:38 +02:00
GUIDELINES.md	…
Makefile.files	Removed oauth2 app from system apps.	2014-08-20 10:57:48 +02:00