Kuba Szczodrzyński 3ae9ba3d61 Merge branch 'develop' into feature/new-login ... # Conflicts: # app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt # app/src/main/res/values/strings.xml		2020-05-11 19:06:07 +02:00
..
libs
proguard
sampledata	[Login] Add new login user interface.	2020-04-16 11:01:53 +02:00
src/main	Merge branch 'develop' into feature/new-login	2020-05-11 19:06:07 +02:00
.gitignore
build.gradle	[API] Implement draft Vulcan Web login.	2020-04-19 19:27:27 +02:00
google-services.json