Frank Celler 4f8ea3a208 Merge remote-tracking branch 'origin/2.5' into devel ... Conflicts: CHANGELOG arangod/RestServer/arangod.cpp js/apps/system/_admin/aardvark/APP/package.json		2015-02-24 16:10:11 +01:00
..
Books	documentation	2015-02-20 17:51:47 +01:00
Examples	release version 2.5.0-beta1	2015-02-23 10:47:30 +01:00
Scripts	issue #1245: Small bug in Tools -> API (auto-created documentation)	2015-02-13 09:09:49 +01:00
man	…
man1	…
man8	…
Makefile.files	release version 2.5.0-alpha7	2015-02-19 19:21:50 +01:00
arangodb.css	…