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

Conflicts: README.md domotika/clouds/responsivevoice/.tts.py.swp

Merge branch 'master' of https://git.nexlab.net/nexlab/domotikad
Conflicts: README.md domotika/clouds/responsivevoice/.tts.py.swp
4453fcd9 · nextime · 60973de7 · 6f2aca57 · 4453fcd9 · 60973de7
Commit 4453fcd9 authored Mar 02, 2016 by nextime
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

README.md README.md +4 -1

.tts.py.swp domotika/clouds/responsivevoice/.tts.py.swp +0 -0

No files found.
--- a/README.md
+++ b/README.md
 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
+
--- a/domotika/clouds/responsivevoice/.tts.py.swp
+++ b/domotika/clouds/responsivevoice/.tts.py.swp