jsteemann c0773691c6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel		2018-07-30 19:27:36 +02:00
..
actions	Add C++ implementation, load-balancing support, and user restriction for tasks API (#5973)	2018-07-25 09:17:43 +02:00
apps/system	AQL Editor Geo Extension (#5382)	2018-07-30 13:08:11 +02:00
client	better status information on shutdown	2018-07-30 19:27:19 +02:00
common	issue 432.1: do not modify IResearchView 'locale' encoding and make it non-updatable (#6014)	2018-07-27 15:08:23 +03:00
node	Upgrade non-breaking node deps (#3883)	2018-07-13 14:08:02 +02:00
server	fix test	2018-07-30 19:27:00 +02:00
.eslintrc	…
.jshintrc	…
GUIDELINES.md	…
minify-node-modules.ps1	Merge with latest changes in improve-jenkins	2017-08-31 17:53:48 +02:00