Merge remote-tracking branch 'origin/develop' into develop

pull/6602/head
Weblate 2018-04-23 17:12:39 +00:00
commit e165c42377
1 changed files with 1 additions and 1 deletions

View File

@ -51,7 +51,7 @@ const COPY_LIST = [
["res/home-status.html", "webapp"],
["res/home/**", "webapp/home"],
["res/vector-icons/**", "webapp/vector-icons"],
["node_modules/matrix-react-sdk/res/{fonts,img,themes}/**", "webapp"],
["node_modules/matrix-react-sdk/res/{fonts,img,themes,media}/**", "webapp"],
["res/themes/**", "webapp/themes"],
["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],