Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Enno Rehling 2017-10-15 20:08:19 +02:00
commit 018f217e4d
2 changed files with 2 additions and 2 deletions

View File

@ -26,4 +26,4 @@ addr=$1
subj=$2
shift 2
cat $ERESSEA/etc/$TEMPLATE | mutt -F $ERESSEA/etc/muttrc -s "$subj" -a $* -- $addr
cat $ERESSEA/server/etc/$TEMPLATE | mutt -F $ERESSEA/etc/muttrc -s "$subj" -a $* -- $addr

View File

@ -27,7 +27,7 @@ fi
if [ -e $GAME/$TEMPLATE ]; then
TEMPLATE=$GAME/$TEMPLATE
else
TEMPLATE=$ERESSEA/etc/$TEMPLATE
TEMPLATE=$ERESSEA/server/etc/$TEMPLATE
fi
if [ ! -e $TEMPLATE ]; then