Simon Grätzer 871272d7c1 Merge from devel		2017-03-12 12:32:22 +01:00
..
actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-08 18:20:44 +01:00
apps/system	ui - fixed wrong merge of statistics information from different coordinators	2017-03-10 16:43:58 +01:00
client	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-09 14:38:50 +01:00
common	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-08 18:20:44 +01:00
contrib	…
node	fixed variables parsing in GraphQL	2017-03-05 23:31:38 +01:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-09 14:38:50 +01:00
.eslintrc	added rule to eslint conf	2016-11-15 14:40:21 +01:00
.jshintrc	try avoiding "line too long" errors	2016-05-13 13:16:05 +02:00
GUIDELINES.md	…