Commit Graph

4 Commits (a3ef1c92d3560d4694ae01fe9d2238ab9ff424ad)

Author SHA1 Message Date
Morgan Pretty a6a545710d Merge remote-tracking branch 'upstream/dev' into feature/drop-yap-database-support 2 years ago
Morgan Pretty f3b2cc577c Fixed the settings bundle and added Cocoapod acknowledgements 2 years ago
Morgan Pretty 8ac6b25ced Further refactoring work
Refactored usages and removed AFNetworking
Updated the media screens to use Combine

# Conflicts:
#	Session/Closed Groups/GroupMembersViewModel.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerCell.swift
#	Session/Media Viewing & Editing/GIFs/GiphyAPI.swift
#	Session/Media Viewing & Editing/PhotoCapture.swift
2 years ago
nielsandriesse 58e69aae9c Organize files 5 years ago