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

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	app/app.iml
	app/src/main/java/info/nightscout/android/medtronic/GetHmacAndKeyActivity.java
	app/src/main/res/layout/activity_login.xml
parents 64ad8c07 084cebf7
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 330 additions and 134 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment