Michael Hackstein 474f70c9ad Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk		2016-04-11 16:33:08 +02:00
..
actions	callback redesign	2016-04-07 10:20:08 +02:00
apps/system	issue #1793	2016-04-07 13:54:11 +02:00
client	agency compiles after pull from devel	2016-04-08 12:40:38 +00:00
common	Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk	2016-04-11 16:33:08 +02:00
contrib	…
node	merging back from agency	2016-04-04 12:13:43 +00:00
server	Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk	2016-04-11 16:33:08 +02:00
.eslintrc	…
.jshintrc	…
GUIDELINES.md	…