Kacper Ziubryniewicz 0395598efb Merge branch 'develop' into api-v2 ...

# Conflicts:
#	app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java

2019-10-21 16:52:52 +02:00

..

proguard

Fix proguard config for Event and EventType

2019-09-29 20:59:20 +02:00

src/main

Merge branch 'develop' into api-v2

2019-10-21 16:52:52 +02:00

.gitignore

you've been waiting for this moment for so long

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

build.gradle

[APIv2/Vulcan] Add Vulcan Api

2019-10-19 20:38:30 +02:00

google-services.json

you've been waiting for this moment for so long

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