Thomas Suckow
78197453a1
Merge remote-tracking branch master into feature/net5-avalonia
# Conflicts:
# Duplicati CommandLine Only.sln
# 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/GUI/Duplicati.GUI.TrayIcon/app.config
# Duplicati/Library/AutoUpdater/UpdaterManager.cs
# Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj
# Duplicati/Library/Main/Duplicati.Library.Main.csproj
# Duplicati/Library/Utility/Duplicati.Library.Utility.csproj
# Duplicati/Library/Utility/Utility.cs
# Duplicati/Server/Duplicati.Server.csproj
# Duplicati/Server/app.config
# Duplicati/Service/app.config
# Duplicati/UnitTest/BackendToolTests.cs
# Duplicati/UnitTest/Duplicati.UnitTest.csproj
# guiTests/guiTest.py
2022-11-11 21:40:08 -08:00
..
2018-06-30 00:19:21 +02:00
2020-07-26 19:46:01 -07:00
2018-06-02 12:05:57 -07:00
2022-11-11 21:40:08 -08:00
2020-07-28 05:51:53 -07:00
2015-08-21 21:59:12 +02:00
2017-01-23 22:12:24 +01:00
2020-07-19 18:01:52 -07:00
2020-07-19 18:01:52 -07:00
2020-01-23 20:41:17 -08:00
2021-04-04 11:17:13 -07:00
2021-04-04 11:17:13 -07:00