Merge branch 'master' of github.com:alt236/Bluetooth-LE-Library---Android
Conflicts: README.md
This commit is contained in:
@@ -174,4 +174,4 @@ All logos are the property of their respective owners.
|
|||||||
|
|
||||||
The code in this project is licensed under the Apache Software License 2.0.
|
The code in this project is licensed under the Apache Software License 2.0.
|
||||||
|
|
||||||
Copyright (c) 2014 Alexandros Schillings.
|
Copyright (c) 2014 Alexandros Schillings.
|
||||||
|
|||||||
Reference in New Issue
Block a user