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
..
aql	Reformat code	2016-06-30 16:57:17 +02:00
foxx	Reformat code	2016-06-30 16:57:17 +02:00
actions.js	Reformat code	2016-06-30 16:57:17 +02:00
arango-collection.js	pushing avoidServers property	2017-01-20 15:15:03 +01:00
arango-database.js	unobserve should not create entries in agency, if empty before	2017-01-20 08:06:27 +01:00
arango-query-cursor.js	fixed cursor printing behavior	2017-01-12 17:26:20 +01:00
arango-statement.js	Reformat code	2016-06-30 16:57:17 +02:00
arangosh.js	Reformat code	2016-06-30 16:57:17 +02:00
configuration.js	Reformat code	2016-06-30 16:57:17 +02:00
index.js	Fix release matching for alpha/beta versions	2016-08-30 14:39:48 +02:00
pregel.js	Fixed pregel API	2017-01-21 19:00:37 +01:00
replication.js	Reformat code	2016-06-30 16:57:17 +02:00
simple-query.js	Reformat code	2016-06-30 16:57:17 +02:00
tasks.js	Reformat code	2016-06-30 16:57:17 +02:00
testing.js	fixed --convert false in arangoimp	2017-03-02 15:05:06 +01:00
tutorial.js	Optimized arangosh tutorial for 80 char width, slightly extended	2016-08-22 20:59:54 +02:00
users.js	attempt to fix issues reported by @ewoutp	2017-03-03 14:47:21 +01:00
work-monitor.js	Reformat code	2016-06-30 16:57:17 +02:00