Merge branch 'master' into subtree

[nikiroo-utils.git] / output / Html.java

diff --git a/src/be/nikiroo/fanfix/output/Html.java b/output/Html.java
similarity index 100%
rename from src/be/nikiroo/fanfix/output/Html.java
rename to output/Html.java