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
..
bootstrap	throw error if collection not yet loaded	2015-08-10 17:08:41 +02:00
modules	Class-based controllers, models, repos and request contexts.	2015-08-11 13:08:41 +02:00
test-data	Fixed scripts fields in fixture apps.	2015-07-01 17:07:37 +02:00
tests	Wrong error.	2015-07-14 20:11:03 +02:00