Merge branch 'vector-im:master' into recalculate_dm

This commit is contained in:
Kaki In 2022-07-29 17:07:53 +02:00 committed by GitHub
commit 57e61c1421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
#!/bin/zsh
cp theme.json target/assets/theme-customer.json
#!/bin/sh
cp scripts/test-derived-theme/theme.json target/assets/theme-customer.json
cat target/config.json | jq '.themeManifests += ["assets/theme-customer.json"]' | cat > target/config.temp.json
rm target/config.json
mv target/config.temp.json target/config.json