Merge branch 'master' into develop

This commit is contained in:
David Baker 2015-02-25 18:33:20 +00:00
commit 6f7f18d02e

View file

@ -220,6 +220,7 @@
#pragma mark - APNS methods #pragma mark - APNS methods
- (void)registerUserNotificationSettings { - (void)registerUserNotificationSettings {
NSLog(@"[AppDelegate] Attempting to get push token...");
if (!isAPNSRegistered) { if (!isAPNSRegistered) {
if ([[UIApplication sharedApplication] respondsToSelector:@selector(registerUserNotificationSettings:)]) { if ([[UIApplication sharedApplication] respondsToSelector:@selector(registerUserNotificationSettings:)]) {
// Registration on iOS 8 and later // Registration on iOS 8 and later