Merged master to 1.0

2026-08-13 05:31:37 +08:00 · 2017-03-08 22:01:44 +01:00
parent 0cecadfd3a c2d583f19a
commit 1d470660a7
28 changed files with 25357 additions and 29937 deletions
@@ -152,6 +152,7 @@ App.init();
        </p>
      </footer>

+    <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>