2 Commits

Author	SHA1	Message	Date
Michael Hackstein	5b3fae42aa	Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes ... Conflicts: js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js js/common/bootstrap/errors.js lib/Basics/voc-errors.cpp lib/Basics/voc-errors.h	2015-02-13 10:20:36 +01:00
Michael Hackstein	f429c8af63	Moved all system apps to new folder structure	2015-01-26 11:57:08 +01:00