Files
duplicati/Duplicati/Library/Main/Strings
Kenneth Skovhede 93bdb2a434 Merge branch 'master' into sandboxes/Kenneth/ForestHash
Conflicts:
	Duplicati/CommandLine/Help.cs
	Duplicati/CommandLine/Program.cs
	Duplicati/Library/Main/Strings/Interface.Designer.cs
	Duplicati/Library/Main/Strings/Interface.resx
	Duplicati/Library/Main/Strings/Options.Designer.cs
	Duplicati/Library/Main/Strings/Options.resx
2013-05-04 14:07:04 +02:00
..
2013-03-27 16:10:47 +01:00
2013-03-27 16:10:47 +01:00