Frank Celler 0e7be8dddf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: js/apps/system/aardvark/frontend/js/templates/navigationView.ejs		2014-11-01 10:14:55 +01:00
..
actions	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-11-01 10:14:55 +01:00
apps/system	updated links to arangodb.com	2014-11-01 10:13:04 +01:00
client	updated links to arangodb.com	2014-11-01 10:13:04 +01:00
common	fixed tests	2014-10-31 19:58:20 +01:00
node	…
server	fixed results	2014-10-31 20:17:08 +01:00
.jshintrc	…
GUIDELINES.md	…
Makefile.files	…