ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/telemetry

Browse Source 
# Conflicts:
#	Classes/BITFeedbackManager.m
#	Support/HockeySDK.xcodeproj/project.pbxproj
This commit is contained in:
Lukas Spieß
2015-10-09 14:36:56 +02:00
parent 8d945beedf 0bf1bd929c
commit ffd5120a56
36 changed files with 251 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/BITImageAnnotationViewController.m
View File

@@ -419,4 +419,4 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
}
@end
#endif
#endif /* HOCKEYSDK_FEATURE_FEEDBACK */