Merge remote-tracking branch 'Nightscout/dev' into New/AddMoreStrings

Browse source

# Conflicts:
#	app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt

...

This commit is contained in:

Philoul 2021-11-23 00:06:28 +01:00

parent bbab3b0c9d ae573de63d

commit 97d0ddf69d

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