Commit 4453fcd9 authored by nextime's avatar nextime

Merge branch 'master' of https://git.nexlab.net/nexlab/domotikad

Conflicts:
	README.md
	domotika/clouds/responsivevoice/.tts.py.swp
parents 60973de7 6f2aca57
domotikad domotikad
========= =========
Domotikad developement has moved to https://git.nexlab.net/nexlab/domotikad To change git origin:
* git remote rm origin
* git remote add origin https://git.nexlab.net/nexlab/domotikad.git
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment