Merge branch 'master' of http://86.49.170.141:3000/UniPi/neuron-kernel
authorTom Knot <tomasknot@gmail.com>
Thu, 14 Jun 2018 10:01:17 +0000 (12:01 +0200)
committerTom Knot <tomasknot@gmail.com>
Thu, 14 Jun 2018 10:01:17 +0000 (12:01 +0200)
commit2d137ed72626afa8a8c646dc137e736c5dd53bd4
tree6fb4e607b75e7d89be6e6cef2afbfb6dbda0134e
parent04e9aea682a35478d01d91c5e684d8b5ad48d77e
parenta9e956fd6204908d8ab490c514abdf7c7e2196c7
Merge branch 'master' of 86.49.170.141:3000/UniPi/neuron-kernel

# Conflicts:
# modules/unipi/src/unipi_uart.c
# version.txt
version.txt