Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # arangosh/Import/ImportHelper.cpp		2017-03-04 02:08:27 +01:00
..
actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-04 02:08:27 +01:00
apps/system	grunt	2017-03-01 17:09:41 +01:00
client	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-04 02:08:27 +01:00
common	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-04 02:08:27 +01:00
contrib	…
node	arangoexport: added test for xgmml, node module xmldom	2017-02-28 15:25:18 +01:00
server	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-03-04 02:08:27 +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	…