Sean Mac Gillicuddy 2cf774e51b Merge branch 'develop' into translatewiki ...

# Conflicts:
#	core/src/main/res/values-ar/strings.xml

2020-03-12 16:59:23 +00:00

..

objectbox-models

update version number

2019-12-10 16:46:44 +00:00

src

Merge branch 'develop' into translatewiki

2020-03-12 16:59:23 +00:00

build.gradle.kts

#1786 Upgrade kiwixlib - bump version and change JniKiwixLibrary->Library

2020-02-21 15:01:40 +00:00

consumer-rules.pro

…

detekt_baseline.xml

Merge remote-tracking branch 'origin/develop' into feature/macgills/detekt

2020-02-21 10:37:31 +00:00

proguard-rules.pro

…