Kuba Szczodrzyński d8abac1917 Merge branch 'develop' into feature/structure-refactor ... # 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		2021-10-19 13:45:29 +02:00
..
libs	[Gradle] Move java-json to app/libs.	2020-01-02 18:49:43 +01:00
proguard	[Proguard] Remove unneeded rules. Move app proguard rules.	2021-03-21 22:49:43 +01:00
sampledata	[Login] Add new login user interface.	2020-04-16 11:01:53 +02:00
src/main	Merge branch 'develop' into feature/structure-refactor	2021-10-19 13:45:29 +02:00
.gitignore	you've been waiting for this moment for so long	2019-09-18 22:29:09 +02:00
build.gradle	[Gradle] Migrate JCenter dependencies to JitPack. (#97)	2021-10-15 22:37:46 +02:00
git-info.gradle	[App] Fix detecting correct remote repository name.	2021-04-03 15:13:10 +02:00
google-services.json	you've been waiting for this moment for so long	2019-09-18 22:29:09 +02:00
proguard-rules.pro	[Refactor] Flatten .ui package.	2021-10-17 21:02:35 +02:00