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-08-24 16:16:07 +01:00
2015-08-21 21:59:12 +02:00
2016-06-27 15:25:52 +02:00
2015-08-21 21:59:12 +02:00
2015-08-21 21:59:12 +02:00
2015-09-17 20:02:34 +02:00
2015-08-21 21:59:12 +02:00
2015-09-05 09:38:52 +02:00
2016-06-05 23:37:10 +02:00
2016-06-05 23:37:10 +02:00
2016-05-29 00:56:25 +02:00