Christian Basler
e8de311d7e
Merge remote-tracking branch 'origin/develop' into feature/SyncAdapter
Conflicts: app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java app/src/main/res/values-de/strings.xml app/src/main/res/values/strings.xml
Description
Abit is a client for the Bitmessage protocol that runs on Android™ devices.
https://dissem.ch/abit/
Languages
Kotlin
93.9%
Java
3.6%
Gradle
1.4%
SQL
1.1%