diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-07-26 17:04:04 -0700 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2014-07-26 17:04:04 -0700 |
| commit | 415c32bfb02b25d510aca115ca5f075e3cda0c36 (patch) | |
| tree | c304804085e65dd385437fcd7da61d2e96e52605 /client/modules/Unclear.py | |
| parent | 44c9bacf3b3ef24a0f0ef971db45f145b54ff77c (diff) | |
| parent | 10a57e25f29bd4cdf8caf50d1ebeff20ac506b9d (diff) | |
| download | jasper-client-415c32bfb02b25d510aca115ca5f075e3cda0c36.tar.gz jasper-client-415c32bfb02b25d510aca115ca5f075e3cda0c36.zip | |
Merge upstream changes
Conflicts:
client/local_mic.py
Diffstat (limited to 'client/modules/Unclear.py')
0 files changed, 0 insertions, 0 deletions