Kenneth Skovhede
3005594b38
Merge branch 'master' into nuget_setup
# Conflicts:
# Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
# Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj
# Duplicati/Library/Backend/S3/S3Wrapper.cs
# thirdparty/CoCoL/CoCoL.dll
# thirdparty/SSH.NET/Renci.SshNet.dll
2016-06-27 15:25:52 +02:00
..
2015-05-17 11:06:07 +02:00
2015-01-26 11:22:52 +01:00
2016-06-27 15:25:52 +02:00
2009-01-15 19:42:14 +00:00
2015-01-20 21:45:54 +01:00
2015-01-20 21:07:24 +01:00
2015-01-20 21:44:52 +01:00