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
..
Books	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-11-01 10:14:55 +01:00
Examples	…
Scripts	linted python files, regenerated derived files	2014-10-29 23:56:20 +01:00
man	…
man1	…
man8	…
Makefile.files	m4 cleanup	2014-10-29 20:36:56 +01:00
arangodb.css	…
empty.html	…