Merge branch 'develop' into 'master'

Develop



See merge request !4
This commit is contained in:
Giuseppe Nucifora committed 2016-01-29 10:24:34 +00:00
commit b5bf466ce6
2 files changed
+4 -3

No files matched your search

+3 -2
View File
@@ -15,12 +15,13 @@
@required @required
+ (NSString * _Nonnull ) objectClassName;
+ (NSDictionary * _Nonnull) objcetMapping; + (NSDictionary * _Nonnull) objcetMapping;
+ (BOOL) singleInstance; + (BOOL) singleInstance;
@optional
+ (NSString * _Nonnull ) objectClassName;
@end @end
+1 -1
View File
@@ -45,7 +45,7 @@
} }
+ (NSString*) objectClassName { + (NSString*) objectClassName {
return @"PNObject"; return NSStringFromClass([self class]);
} }
#pragma mark - #pragma mark -