Michael Hackstein fb02eb07f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: js/apps/system/aardvark/frontend/scss/generated.css		2014-03-18 18:32:27 +01:00
..
api-docs	cleaned up merge mess	2014-03-03 15:24:10 +01:00
clusterFrontend	Fixed JSLint warnings	2014-03-09 08:32:34 +01:00
frontend	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-03-18 18:32:27 +01:00
lib	issue #772: added diagnostic output for Foxx application upload	2014-03-14 10:50:38 +01:00
repositories	Fixed problems with Cluster Overview when cluster is authenticated. User needs zu supply a coordinator user	2014-03-06 16:24:28 +01:00
test	Fixed karma tests and jslint whining	2014-03-17 16:58:53 +01:00
aardvark.js	…
api-docs.json	release version 2.0.0-rc1	2014-03-02 08:06:31 +01:00
cluster.js	Fixed problems with Cluster Overview when cluster is authenticated. User needs zu supply a coordinator user	2014-03-06 16:24:28 +01:00
favicon.ico	…
index.html	…
manifest.json	merged	2014-03-18 15:25:45 +01:00