Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
README.md
indermuehle | Jan 30 2017, 16:26 |
indermuehle | Jan 30 2017, 16:27 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
146fa088ebdf | indermuehle | New now python server run as service on Mac Os | Jan 30 2017 |