Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: js/apps/system/aardvark/frontend/js/bootstrap/errors.js		2014-06-11 17:40:15 +02:00
..
bootstrap	jslint	2014-06-11 16:00:27 +02:00
modules/org	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-11 17:40:15 +02:00
tests	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-11 17:40:15 +02:00
arango-dfdb.js	fixed dfdb	2014-06-04 11:02:42 +02:00
server.js	added gc for statistics	2014-05-25 23:10:56 +02:00
upgrade-check.js	cleanup of version-check, added option check-version	2014-06-01 13:37:21 +02:00
version-check.js	removed outdated upgrade methods	2014-06-11 17:38:49 +02:00