Merge branch 'josh-patch-1' into bowerify

mtodd · mtodd · commit 8a78645a0117 · 2013-10-31T17:47:14.000-07:00
Conflicts:
	script/bootstrap
diff --git a/app/assets/javascripts/task_lists.coffee b/app/assets/javascripts/task_lists.coffee
@@ -5,7 +5,7 @@
 #= provides tasklist:change
 #= provides tasklist:changed
 #
-#= require crema/element/fire
+#= require crema/events/fire
 #= require crema/events/pageupdate
 #
 # Enables Task List update behavior.

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#= provides tasklist:change`
`6`	`6`	`#= provides tasklist:changed`
`7`	`7`	`#`
`8`		`-#= require crema/element/fire`
	`8`	`+#= require crema/events/fire`
`9`	`9`	`#= require crema/events/pageupdate`
`10`	`10`	`#`
`11`	`11`	`# Enables Task List update behavior.`