Michael Hackstein 3e1b295d68 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk		2016-04-07 10:30:41 +02:00
..
actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-04-06 15:43:27 +02:00
apps/system	Kickstarter and planner are dead	2016-04-05 17:45:39 +02:00
client	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-04-06 15:43:27 +02:00
common	Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk	2016-04-07 10:30:41 +02:00
contrib	…
node	merging back from agency	2016-04-04 12:13:43 +00:00
server	removed obsolete tests	2016-04-06 17:48:11 +02:00
.eslintrc	…
.jshintrc	Disable loopfunc warnings (not helpful..decided in quorum)	2016-03-18 10:58:50 +00:00
GUIDELINES.md	…