Jan Steemann a014b44ba4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Utils/Transaction.h		2014-08-28 11:06:14 +02:00
..
actions	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-28 11:06:14 +02:00
apps/system	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-27 19:25:37 +02:00
client	jslint	2014-08-06 13:50:21 +02:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-27 19:25:37 +02:00
node	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-28 11:06:14 +02:00
GUIDELINES.md	…
Makefile.files	Removed oauth2 app from system apps.	2014-08-20 10:57:48 +02:00