Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-02-26 13:59:47 +01:00
commit 2291d41a87

View file

@ -229,6 +229,7 @@ task cleanNoTranslate(type: Delete) {
task collectFonts(type: Copy) {
from "../../resources/fonts"
from "../../resources/rendering_styles/fonts"
// from "../../resources/rendering_styles/fonts/OpenSans"
into "assets/fonts"