Michael Hackstein 858a8ba4f8 Merge branch 'devel' of github.com:arangodb/arangodb into devel		2015-10-30 10:27:21 +01:00
..
actions	added ARANGODB_DEFAULT_ROOT_PASSWORD	2015-09-29 13:15:25 +02:00
apps/system	grunt build	2015-10-30 10:27:11 +01:00
client	reverted 0692264fe2, cbe78e3b1f, 61d3846356, e26c2295fb, 6bc34aa8ce, c0e9db0769 because of missing CLA	2015-10-29 19:59:43 +01:00
common	added deadlock detection for lazy locking of collections	2015-10-29 11:57:22 +01:00
contrib	…
node	Implemented FoxxService	2015-09-24 13:46:14 +02:00
server	Added more CXX tests for AQL numeric functions	2015-10-30 10:00:25 +01:00
.eslintrc	Added eslintrc	2015-09-24 13:46:13 +02:00
.jshintrc	…
GUIDELINES.md	…
Makefile.files	removed duplicate target from Makefile	2015-10-23 13:41:09 +02:00