Commit Graph

5 Commits (593acd8e376a556f4470310e478c63a1aa5f1fbf)

Author SHA1 Message Date
Morgan Pretty 5e3dd3c731 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
#	Session/Shared/Views/SessionCell+AccessoryView.swift
#	SessionMessagingKit/Configuration.swift
#	SessionMessagingKit/Database/Models/Interaction.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUtilitiesKit/Database/Models/Job.swift
2 years ago
Ryan Zhao d5343ac236 fix get_expiries endpoints & clean up 2 years ago
ryanzhao 33c239eae2 WIP: debug new endpoints 2 years ago
Niels Andriesse d742fc1548 Delete V1 OGS & file server 4 years ago
Niels Andriesse e9df213bfe Put feature flags in one place 4 years ago