Merge branch 'master' into gh-pages

Conflicts:
	javascripts/vendor/custom.modernizr.js
	javascripts/vendor/zepto.js
	mockup.html
	stylesheets/normalize.css
This commit is contained in:
2016-02-01 17:05:29 +08:00
17 changed files with 343 additions and 2569 deletions
+1 -1
View File
@@ -25,7 +25,7 @@
"updatedAt": "2016-01-29T05:44:30.858Z"
}, {
"id": 83,
"content": "Desyncr pulled this together in a few hours to learn Backbone",
"content": "Pulled this together in a few hours to learn Backbone",
"parentId": 0,
"isCompleted": false,
"priority": 0,