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
..
css	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-03-18 18:32:27 +01:00
fonts	…
html	…
img	removed unused images	2014-03-18 14:51:42 +01:00
js	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-03-18 18:32:27 +01:00
scss	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-03-18 18:32:27 +01:00
src	…
ttf	…
aqltemplates.json	…
favicon.ico	…