Merge branch 'master' into 'manoj_dev'
# Conflicts: # dataq/detect.py
Showing
index.html
deleted
100644 → 0
templates/index.html
deleted
100644 → 0
test1.jpg
deleted
100644 → 0
131 KB
test2.jpg
deleted
100644 → 0
131 KB
test3.jpg
deleted
100644 → 0
136 KB
test4.jpg
deleted
100644 → 0
64.3 KB
test55.jpg
deleted
100644 → 0
131 KB
textvoice/__init__.py
0 → 100644
textvoice/textVoiceAs.py
0 → 100644
No preview for this file type
translation/transtest.py
0 → 100644