Merged master to 1.0

This commit is contained in:
Christoph Oberhofer
2017-03-08 22:01:44 +01:00
28 changed files with 25357 additions and 29937 deletions
+1 -1
View File
@@ -71,7 +71,7 @@
</div>
</section>
<ul class="results"></ul>
<script src="//webrtc.github.io/adapter/adapter-latest.js" type="text/javascript"></script>
<script src="../../dist/quagga.js" type="text/javascript"></script>
<script src="index.js" type="text/javascript"></script>
<script src="../vendor/prism.js"></script>