Jan Steemann cd1d0c45f8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/V8Server/v8-query.cpp		2014-08-27 19:25:37 +02:00
..
css	…
fonts	…
html	style changes + dashboard now async ajax calls	2014-08-22 11:39:51 +02:00
img	…
js	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-27 19:25:37 +02:00
scss	css changes	2014-08-26 16:13:14 +02:00
src	…
ttf	…
aqltemplates.json	…
favicon.ico	…