1
0
mirror of https://github.com/fabianonline/telegram_backup.git synced 2024-12-25 14:25:35 +00:00

Merging master into stable for version 1.1.3

This commit is contained in:
Fabian Schlenz 2018-03-08 22:23:26 +01:00
commit ad6f57d153
2 changed files with 2 additions and 2 deletions

View File

@ -85,7 +85,7 @@ this will be detected at the next run of this program and then tried again.
The files are being saved in your User directory in a folder named
`telegram_backup`. Under windows, this would typically be under
`C:\Users\<username>\telegram_backup`. Linux users should look unter
`/home/<username>/telegram_backup`.
`/home/<username>/.telegram_backup`.
You can change this directory by supplying `--target <dir>` when calling
Telegram_Backup.

View File

@ -35,7 +35,7 @@ echo "Updating the Dockerfile..."
sed -i "s/ENV JAR_VERSION .\+/ENV JAR_VERSION $VERSION/g" Dockerfile || error "Couldn't modify Dockerfile."
echo "Committing the new Dockerfile..."
git commit -m "Bumping the version to $VERSION" Dockerfile || error "Couldn't commit the new Dockerfile."
git commit -m "Bumping the version to $VERSION" Dockerfile
echo "Tagging the new version..."
git tag -a "$VERSION" -m "Version $VERSION" || error