Skip to content
Snippets Groups Projects
Commit 195d50f0 authored by jgwashburn@gmail.com's avatar jgwashburn@gmail.com
Browse files

Merge branch 'develop' of https://github.com/pazaan/640gAndroidUploader 

Conflicts:
	app/build.gradle
	app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
	app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
	app/src/main/java/info/nightscout/android/upload/nightscout/NightscoutUploadIntentService.java
	app/src/main/res/values/strings.xml
parents af395662 cb9fe03b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 771 additions and 715 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment