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

[Gradle] Move java-json to app/libs.

2020-01-02 18:49:43 +01:00

proguard

[Proguard] Update proguard rules to fix BetterLink and MiniDrawer.

2020-03-24 21:03:19 +01:00

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

you've been waiting for this moment for so long

2019-09-18 22:29:09 +02:00

build.gradle

[API] Implement draft Vulcan Web login.

2020-04-19 19:27:27 +02:00

google-services.json

you've been waiting for this moment for so long

2019-09-18 22:29:09 +02:00