Merge remote-tracking branch 'origin/tree-732'

2016-03-14 16:15:05 -07:00
parent 4e89ffbe07 55ae755522
commit 936079da92
17 changed files with 962 additions and 18 deletions
--- a/main.js
+++ b/main.js
@@ -33,7 +33,8 @@ requirejs.config({
        "saveAs": "bower_components/FileSaver.js/FileSaver.min",
        "screenfull": "bower_components/screenfull/dist/screenfull.min",
        "text": "bower_components/text/text",
-        "uuid": "bower_components/node-uuid/uuid"
+        "uuid": "bower_components/node-uuid/uuid",
+        "zepto": "bower_components/zepto/zepto.min"
    },
    "shim": {
        "angular": {
@@ -44,6 +45,9 @@ requirejs.config({
        },
        "moment-duration-format": {
            "deps": [ "moment" ]
+        },
+        "zepto": {
+            "exports": "Zepto"
        }
    }
 });