You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-ios/SignalUtilitiesKit/Utilities
Morgan Pretty c25f378c54 Merge branch 'feature/database-refactor' into emoji-reacts
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Context Menu/ContextMenuVC+Action.swift
#	Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
#	Session/Conversations/Context Menu/ContextMenuVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewItem.h
#	Session/Conversations/ConversationViewItem.m
#	Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift
#	Session/Conversations/Message Cells/MessageCell.swift
#	Session/Conversations/Message Cells/VisibleMessageCell.swift
#	Session/Conversations/Views & Modals/BodyTextView.swift
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Shared/UserCell.swift
#	SessionMessagingKit/Jobs/MessageSendJob.swift
#	SessionMessagingKit/Messages/Signal/TSMessage.h
#	SessionMessagingKit/Messages/Signal/TSMessage.m
#	SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
#	SessionMessagingKit/Open Groups/OpenGroupAPIV2.swift
#	SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
#	SessionMessagingKit/Sending & Receiving/Notifications/NotificationsProtocol.h
#	SessionMessagingKit/Sending & Receiving/Pollers/OpenGroupPollerV2.swift
#	SessionMessagingKit/Utilities/General.swift
#	SessionNotificationServiceExtension/NSENotificationPresenter.swift
#	SignalUtilitiesKit/Utilities/DisplayableText.swift
#	SignalUtilitiesKit/Utilities/NoopNotificationsManager.swift
#	SignalUtilitiesKit/Utilities/Notification+Loki.swift
3 years ago
..
AppSetup.swift
AppVersion.h
AppVersion.m
Bench.swift
ByteParser.h
ByteParser.m
Collection+OWS.swift
CommonStrings.swift
Differentiable+Utilities.swift
DirectionalPanGestureRecognizer.swift
FeatureFlags.swift
FunctionalUtil.h
FunctionalUtil.m
ImageCache.swift
NSAttributedString+OWS.h
NSAttributedString+OWS.m
NSURLSessionDataTask+StatusCode.h
NSURLSessionDataTask+StatusCode.m
NoopNotificationsManager.swift
Notification+Loki.swift
OWSAlerts.swift
OWSDispatch.h
OWSDispatch.m
OWSError.h
OWSError.m
OWSFormat.h
OWSFormat.m
OWSOperation.h
OWSOperation.m
OWSSignalAddress.swift
OrderedDictionary.swift
OutageDetection.swift
ParamParser.swift
ReachabilityManager.swift
ReverseDispatchQueue.swift
SSKAsserts.h
Searcher.swift
ShareViewDelegate.swift
SignalIOS.pb.swift
SignalIOSProto.swift
SwiftSingletons.swift
TSConstants.h
TSConstants.m
UIAlertController+OWS.swift
UIColor+Extensions.swift
UIColor+OWS.h
UIColor+OWS.m
UIFont+OWS.h
UIFont+OWS.m
UIGestureRecognizer+OWS.swift
UIImage+OWS.swift
UIUtil.h
UIUtil.m
UIView+OWS.swift
UIView+Utilities.swift
UIViewController+OWS.h
UIViewController+OWS.m
UIViewController+Utilities.swift
WeakTimer.swift