Merge remote-tracking branch 'origin/develop' into feature/puddle-arch · CocoaHeadsConference/CHConferenceApp@bf2bbf4 · GitHub

Commit

Merge remote-tracking branch 'origin/develop' into feature/puddle-arch

Browse files

# Conflicts:
#	NSBrazilConf.xcodeproj/project.pbxproj
#	NSBrazilLib/Sources/NSBrazilLib/Legacy/Views/HomeFacelift.swift
#	NSBrazilLib/Sources/NSBrazilLib/Legacy/Views/HomeTabBar.swift

Loading branch information

loloop committed Aug 12, 2024

2 parents 198e894 + bc0c53b commit bf2bbf4