Thomas Suckow
70727b9f68
Merge remote-tracking branch 'duplicati/master'
# Conflicts:
# .appveyor.yml
# Duplicati.sln
# Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
# Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
# Duplicati/CommandLine/Duplicati.CommandLine.csproj
# Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
# Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
# Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj
# Duplicati/Library/Backend/SSHv2/packages.config
# Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
# Duplicati/Library/Backend/Telegram/Duplicati.Library.Backend.Telegram.csproj
# Duplicati/Library/Backend/Telegram/Properties/AssemblyInfo.cs
# Duplicati/License/Duplicati.License.csproj
# Duplicati/Server/Duplicati.Server.csproj
# Duplicati/UnitTest/Duplicati.UnitTest.csproj
# Duplicati/UnitTest/PurgeTesting.cs
# Installer/fedora/duplicati-binary.spec
# Installer/fedora/duplicati.spec
# guiTests/guiTest.py
# pipeline/shared/duplicati.sh
# pipeline/stage_build/trigger.sh
# pipeline/stage_integrationtests/job.sh
# pipeline/stage_integrationtests/trigger.sh
# pipeline/stage_unittests/trigger.sh
2021-04-01 20:30:19 -07:00
..
2020-04-06 14:39:45 +03:00
2020-07-26 19:46:01 -07:00
2021-02-26 10:30:53 +02:00
2020-06-03 00:00:38 +02:00