Max Neunhoeffer 6adc95ddce Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types		2016-09-06 14:59:42 +02:00
..
actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types	2016-09-06 11:22:14 +02:00
apps/system	grunt build	2016-08-24 16:38:07 +02:00
client	Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types	2016-09-06 14:40:51 +02:00
common	fixed some explainer errors	2016-09-06 13:27:04 +02:00
contrib	…
node	Revert "Remove iconv-lite"	2016-08-16 16:08:42 +02:00
server	Better error reporting in tryLaunchTask.	2016-09-06 14:28:00 +02:00
.eslintrc	We are now using semistandard and eslint	2016-06-29 18:27:02 +02:00
.jshintrc	try avoiding "line too long" errors	2016-05-13 13:16:05 +02:00
GUIDELINES.md	…