Kenneth Skovhede
4f565a004f
Merge branch 'netstandard' of https://github.com/mnaiman/duplicati into netstandard
# Conflicts:
# 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
2021-04-01 15:08:42 +02:00
..
2020-07-27 16:09:26 -07:00
2021-01-02 13:49:27 -08:00
2021-03-07 09:37:56 +01:00
2020-04-20 21:03:20 -07:00
2020-07-16 15:57:15 +02:00
2020-07-16 15:57:15 +02:00
2020-12-29 09:59:42 -08:00
2020-09-28 15:34:44 -07:00