Merge and track latest features on stable #6

Merged
Ark74 merged 71 commits from unstable into master 2020-08-08 06:41:50 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit d2bd5bd6a0 - Show all commits

View File

@ -9,7 +9,7 @@ TITLE_FILE="/usr/share/jitsi-meet/title.html"
INT_CONF="/usr/share/jitsi-meet/interface_config.js" INT_CONF="/usr/share/jitsi-meet/interface_config.js"
BUNDLE_JS="/usr/share/jitsi-meet/libs/app.bundle.min.js" BUNDLE_JS="/usr/share/jitsi-meet/libs/app.bundle.min.js"
# #
JM_IMG_PATH="/usr/share/jitsi-meet/images/" JM_IMG_PATH="/usr/share/jitsi-meet/images"
WTM2_PATH="$JM_IMG_PATH/watermark2.png" WTM2_PATH="$JM_IMG_PATH/watermark2.png"
FICON_PATH="$JM_IMG_PATH/favicon2.ico" FICON_PATH="$JM_IMG_PATH/favicon2.ico"
# #

View File

@ -604,7 +604,7 @@ chown jibri:jibri $REC_DIR
chmod +x $REC_DIR chmod +x $REC_DIR
## JSON Config ## JSON Config
cp $CONF_JSON $CONF_JSON.orig cp $CONF_JSON ${CONF_JSON}.orig
cat << CONF_JSON > $CONF_JSON cat << CONF_JSON > $CONF_JSON
{ {
"recording_directory":"$DIR_RECORD", "recording_directory":"$DIR_RECORD",