Merge to develop

Browse source

# 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:

jacques 2020-07-18 20:26:33 +02:00

parent 56796a8a71 1484977f1f

commit a9dbc8418a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available