Merge remote-tracking branch 'origin/aaron/rf2-refactor' into aaron/r… · pennlabs/penn-mobile-android@6c7a5a2 · GitHub

Commit

Merge remote-tracking branch 'origin/aaron/rf2-refactor' into aaron/r…

Browse files

…f2-refactor

# Conflicts:
#	PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt

main
(#643)

meiron03 committed Jan 23, 2025

2 parents 59adafd + 0655f7f commit 6c7a5a2