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
..
assets	[4.1] Update build.gradle, signing and changelog.	2020-05-09 15:23:44 +02:00
cpp	[4.1] Update build.gradle, signing and changelog.	2020-05-09 15:23:44 +02:00
java/pl/szczodrzynski/edziennik	Merge branch 'develop' into feature/new-login	2020-05-11 19:06:07 +02:00
res	Merge branch 'develop' into feature/new-login	2020-05-11 19:06:07 +02:00
AndroidManifest.xml	Merge branch 'develop' into feature/new-login	2020-05-11 19:06:07 +02:00