Merge branch 'master' into develop

This commit is contained in:
David Baker 2019-03-06 11:28:54 +00:00
commit 1e7af106b0
6 changed files with 186 additions and 6 deletions

View file

@ -23,5 +23,5 @@ ln -s "$REACT_SDK_DIR/node_modules/matrix-js-sdk" node_modules/matrix-js-sdk
rm -r node_modules/matrix-react-sdk
ln -s "$REACT_SDK_DIR" node_modules/matrix-react-sdk
RIOT_LANGUAGES_FILE="../riot-web/webapp/i18n/languages.json" npm run build
npm run build
popd