Merge remote-tracking branch 'origin/master' into touchdown

Conflicts:
	static/js/app.js
This commit is contained in:
Jake Moshenko 2014-05-07 15:32:27 -04:00
commit 73a0cc791b
48 changed files with 772 additions and 386 deletions

View file

@ -230,3 +230,4 @@ var saveAs = saveAs
// with an attribute `content` that corresponds to the window
if (typeof module !== 'undefined') module.exports = saveAs;
window.saveAs = saveAs;