Commit Graph

3 Commits

Author SHA1 Message Date
Nathan Sobo
c6770aa83e Merge remote-tracking branch 'origin/master' into ns-remove-telepath-from-core
Conflicts:
	package.json
	src/pane.coffee
2014-01-03 17:46:45 -07:00
Kevin Sawicki
0112e8887f biscotto is in build folder not tasks folder 2014-01-03 10:12:55 -08:00
Kevin Sawicki
70c14eb4f5 Move tasks to build directory 2014-01-03 08:32:23 -08:00