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

..

Properties

Fixed an invalid line-ending character

2015-08-05 13:51:56 +02:00

Duplicati.Library.Backend.OpenStack.csproj

Merge branch 'master' into nuget_setup

2016-06-27 15:25:52 +02:00

Duplicati.snk

Added an OpenStack backend, tested with RackSpace.

2015-07-01 13:50:07 +02:00

OpenStackConfig.cs

Fixed an invalid line-ending character

2015-08-05 13:51:56 +02:00

OpenStackStorage.cs

Fixed the timeout issue

2016-04-16 17:51:44 +02:00

packages.config

Removed unused references and updated most libraries to come from NuGet sources instead of being provided in the thirdparty library

2016-01-29 10:47:39 +01:00

Strings.cs

Fixed an invalid line-ending character

2015-08-05 13:51:56 +02:00