mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-09-20 11:04:19 +02:00
Merge to develop
# Conflicts: # app/src/main/java/net/foucry/pilldroid/DBMedoc.java # app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java # app/src/main/java/net/foucry/pilldroid/SimpleDividerItemDecoration.java # app/src/main/res/layout/custom_barcode_scanner.xml # build.gradle
This commit is contained in:
commit
a9dbc8418a