jsteemann 6c2bb5513e Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types		2016-09-01 16:06:22 +02:00
..
actions	allow dropping system collections in some rare cases	2016-08-25 12:47:06 +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-01 16:06:22 +02:00
common	Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types	2016-09-01 16:06:22 +02:00
contrib	…
node	Revert "Remove iconv-lite"	2016-08-16 16:08:42 +02:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types	2016-09-01 16:06:22 +02:00
.eslintrc	…
.jshintrc	…
GUIDELINES.md	…