wassname/HackFlowy
1
0
Fork 0
mirror of https://github.com/wassname/HackFlowy.git synced 2026-06-27 16:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gh-pages

Browse Source 
Conflicts:
	javascripts/vendor/custom.modernizr.js
	javascripts/vendor/zepto.js
	mockup.html
	stylesheets/normalize.css
This commit is contained in:
Is Isilon
2016-02-01 17:05:29 +08:00
parent 33f4401065 5cb9ead162
commit 77d7814cf3
17 changed files with 343 additions and 2569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
javascripts/app.js
+2 -2
View File
@@ -7,7 +7,7 @@ require.config({
backbone: '../bower_components/backbone/backbone-min',
localforage: '../bower_components/localforage/dist/localforage',
localforagebackbone: '../bower_components/localforage-backbone/dist/localforage.backbone',
modernizr: "vendor/custom.modernizr",
modernizr: "../bower_components/modernizr/custom.modernizr",
socket: "../bower_components/socket.io-client/socket.io",
text: '../bower_components/text/text',
marionette: '../bower_components/backbone.marionette/lib/backbone.marionette'
@@ -28,5 +28,5 @@ require([
'views/page'
],
function (App) {
new App();
pageView = new App();
});