Merge branch 'master' into gh-pages

Conflicts: javascripts/app.js
2026-07-10 00:30:34 +08:00 · 2016-01-29 22:56:24 +08:00
parent 637ef699b5 f0cf9e6d7b
commit 998d30f31d
9 changed files with 3157 additions and 33 deletions
@@ -5,6 +5,8 @@ require.config({
        jquery: '../bower_components/jquery/dist/jquery.min',
        lodash: "../bower_components/lodash/dist/lodash.min",
        backbone: '../bower_components/backbone/backbone-min',
+        localforage: '../bower_components/localforage/dist/localforage',
+        localforagebackbone: '../bower_components/localforage-backbone/dist/localforage.backbone',
        modernizr: "vendor/custom.modernizr",
        socket: "../bower_components/socket.io-client/socket.io",
        text: '../bower_components/text/text',