Tyler Renelle ea31cc6926 Merge branch 'task-li-notes' into develop ... Conflicts: views/shared/tasks/task.jade		2013-12-30 10:31:17 -07:00
..
lists.jade	#2083 add list-item notes at top-level element	2013-12-29 17:34:21 -07:00
task.jade	Merge branch 'task-li-notes' into develop	2013-12-30 10:31:17 -07:00