mirror of
https://github.com/szkolny-eu/szkolny-android.git
synced 2025-01-18 12:56:45 -06:00
d8abac1917
# Conflicts: # app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt # app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt # app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt # app/src/main/java/pl/szczodrzynski/edziennik/ui/teachers/TeachersAdapter.kt # app/src/main/java/pl/szczodrzynski/edziennik/ui/teachers/TeachersListFragment.kt