5 Commits

Author	SHA1	Message	Date
Simon Grätzer	4b238df049	Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api ... # Conflicts: # js/server/tests/aql/aql-optimizer-collect-methods.js	2017-04-19 14:09:09 +02:00
Simon Grätzer	68386c3e73	Fixing tests	2017-04-19 14:08:18 +02:00
jsteemann	ffabf3f78b	jslint	2017-04-19 13:04:32 +02:00
Simon Grätzer	51ad68746a	Fixed collect methods	2017-04-19 11:29:40 +02:00
Frank Celler	c2a3f90fde	moved tests into sub-directories	2016-01-24 12:21:04 +01:00