0.3.28 to 0.3.29 · Pelops / Copreus

Commits on Source 8

corrected log output · ea382e44
Tobias Gawron-Deutsch authored Dec 14, 2019

ea382e44
initial rfid implementation · 0e523292
Tobias Gawron-Deutsch authored Dec 17, 2019

0e523292
debugged rfid · e249d6b4
Tobias Gawron-Deutsch authored Dec 17, 2019

e249d6b4
Merge branch 'develop' into 'rfid' · ae93fd74
Tobias Gawron-Deutsch authored Dec 17, 2019
```
# Conflicts:
#   config_schema.json
```
ae93fd74
Merge branch 'rfid' into 'develop' · 86123ef3
Tobias Gawron-Deutsch authored Dec 17, 2019
```
Rfid

See merge request !30
```
86123ef3
. · 8fc325b6
Tobias Gawron-Deutsch authored Dec 17, 2019

8fc325b6
Merge branch 'rfid' into 'develop' · 580a6ee8
Tobias Gawron-Deutsch authored Dec 17, 2019
```
.

See merge request !32
```
580a6ee8
Merge branch 'develop' into 'master' · f99e7226
Tobias Gawron-Deutsch authored Dec 17, 2019
```
RFID

See merge request !33
```
f99e7226