2
0

Merge branch 'master' of github.com:Lyndir/MasterPassword

Conflicts:
	MasterPassword/ObjC/iOS/MPPasswordsViewController.m
This commit is contained in:
Maarten Billemont
2014-09-24 16:02:29 -04:00
136 changed files with 4754 additions and 3530 deletions

View File

@@ -0,0 +1,6 @@
framework module Crashlytics {
umbrella header "Crashlytics.h"
export *
module * { export * }
}

View File

@@ -15,13 +15,13 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.2.2</string>
<string>2.2.4</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>iPhoneOS</string>
</array>
<key>CFBundleVersion</key>
<string>36</string>
<string>38</string>
<key>DTPlatformName</key>
<string>iphoneos</string>
<key>MinimumOSVersion</key>

Binary file not shown.

Binary file not shown.

Binary file not shown.