jsteemann c2768d5a86 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel		2016-06-06 22:33:01 +02:00
..
actions	Fix crash due to wrong usage of asyncRequest.	2016-06-06 11:30:39 +02:00
apps/system	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-06-06 13:21:02 +02:00
client	bug in subjobs iteration	2016-06-06 17:08:22 +02:00
common	make some system collections smaller	2016-06-06 17:16:55 +02:00
contrib	…
node	Add proxy check	2016-05-17 20:23:47 +02:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2016-06-06 22:33:01 +02:00
.eslintrc	…
.jshintrc	try avoiding "line too long" errors	2016-05-13 13:16:05 +02:00
GUIDELINES.md	…