Jan Steemann 68465ebba5 Merge branch 'collection-not-loaded' of https://github.com/arangodb/arangodb into devel ... Conflicts: js/apps/system/_admin/aardvark/APP/frontend/build/app.js.gz js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js js/apps/system/_admin/aardvark/APP/frontend/build/app.min.js.gz js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html.gz js/apps/system/_admin/aardvark/APP/frontend/build/standalone.html		2015-08-11 14:16:12 +02:00
..
Books	Merge branch 'collection-not-loaded' of https://github.com/arangodb/arangodb into devel	2015-08-11 14:16:12 +02:00
Examples	New examples.	2015-08-04 18:42:10 +02:00
Scripts	Smarten example generator	2015-08-06 17:52:36 +02:00
man	…
man1	…
man8	…
Makefile.files	Offer to use an already running server to save time	2015-08-06 16:07:10 +02:00
arangodb.css	…