Merge remote-tracking branch 'origin/feat/dashboard' into feat/dashboard · openedx/openedx-app-android@2f02b39 · GitHub

Commit

Merge remote-tracking branch 'origin/feat/dashboard' into feat/dashboard

Browse files

# Conflicts:
#	dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesFragment.kt
#	dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryViewModel.kt

Loading branch information

PavloNetrebchuk committed May 29, 2024

2 parents 465bafa + 3fd6657 commit 2f02b39