Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
e4837af72e
|
@ -50,7 +50,7 @@ const COPY_LIST = [
|
||||||
["res/home.html", "webapp"],
|
["res/home.html", "webapp"],
|
||||||
["res/home-status.html", "webapp"],
|
["res/home-status.html", "webapp"],
|
||||||
["res/home/**", "webapp/home"],
|
["res/home/**", "webapp/home"],
|
||||||
["res/vector-icons/**", "webapp"],
|
["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}/**", "webapp"],
|
||||||
["res/themes/**", "webapp/themes"],
|
["res/themes/**", "webapp/themes"],
|
||||||
["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
|
["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
|
||||||
|
|
Loading…
Reference in New Issue