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-04-16 17:51:44 +02:00
2015-01-20 21:44:52 +01:00
2015-01-20 21:44:52 +01:00
2016-02-28 21:33:12 +01:00
2016-06-27 15:25:52 +02:00
2013-02-12 21:43:14 +00:00
2015-01-20 21:44:52 +01:00
2016-01-27 17:42:03 +01:00
2015-12-27 00:16:45 +01:00
2015-12-05 11:26:34 +01:00
2015-01-20 21:44:52 +01:00
2015-01-20 21:44:52 +01:00
2015-01-20 21:44:52 +01:00
2015-01-20 21:44:52 +01:00
2015-01-20 21:44:52 +01:00
2015-01-20 21:45:54 +01:00
2015-11-17 22:24:11 +01:00
2015-12-05 11:26:34 +01:00
2015-09-08 16:41:16 +02:00
2015-01-20 21:44:52 +01:00
2015-09-04 15:04:04 +02:00
2015-01-20 21:44:52 +01:00
2015-09-08 16:41:16 +02:00
2015-01-20 21:45:54 +01:00
2015-01-20 21:44:52 +01:00
2016-06-22 00:42:48 +02:00
2015-01-20 21:44:52 +01:00
2015-01-20 21:44:52 +01:00