qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into MaterialDesign

Browse Source 
Conflicts:
	src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
	src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
	src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
	src/KeePass.sln
	src/KeePassLib2Android/KeePassLib2Android.csproj
	src/PluginSdkBinding/PluginSdkBinding.csproj
	src/keepass2android/AboutActivity.cs
	src/keepass2android/ExportDatabaseActivity.cs
	src/keepass2android/GroupActivity.cs
	src/keepass2android/GroupBaseActivity.cs
	src/keepass2android/Properties/AndroidManifest_net.xml
	src/keepass2android/keepass2android.csproj
	src/keepass2android/search/SearchProvider.cs
This commit is contained in:
Philipp Crocoll
2015-09-04 05:34:27 +02:00
parent 0e388547d9 fad8dc8b22
commit c7cf120c1d
78 changed files with 11977 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Kp2aBusinessLogic/Io/DropboxFileStorageKeysDummy.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace keepass2android.Io
{
public partial class DropboxFileStorage
{
private const string AppKey = "";
private const string AppSecret = "";
}
public partial class DropboxAppFolderFileStorage
{
private const string AppKey = "";
private const string AppSecret = "";
}
}