Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: CHANGELOG js/apps/system/aardvark/frontend/css/collectionsItemView.css js/apps/system/aardvark/frontend/css/graphlayout.css		2014-02-06 13:18:52 +01:00
..
css	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
fonts	Added new version of graphViewer Icons	2014-02-03 11:42:18 +01:00
img	…
js	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-06 13:18:52 +01:00
src	…
ttf	…
aqltemplates.json	…
favicon.ico	…