Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2018-02-02 15:00:13 -05:00
commit 9818f7e4ac

View File

@ -11,13 +11,13 @@ cd Mindustry.wiki
DESKFILE=$TRAVIS_BUILD_NUMBER"-desktop-bleeding-edge.jar"
cp ../desktop/build/libs/desktop-release.jar $DESKFILE
FILE1="Bleeding-Edge-Build-$TRAVIS_BUILD_NUMBER.md"
FILE1="Bleeding-Edge-Build-"$TRAVIS_BUILD_NUMBER".md"
if [ ! -e $FILE1 ]; then
touch $FILE1
fi
NEWLINE='\n'
NEWLINE="\n"
echo "### Commit #"$TRAVIS_COMMIT".${NEWLINE}Desktop JAR download: [Link]("$DESKFILE")" >> $FILE1
git add $FILE1