Commit Graph

3 Commits

Author SHA1 Message Date
Hiro Asari
715b1a2d36 Drop image and add status for Annotation 2014-01-24 10:32:11 -05:00
Hiro Asari
9e2a8cb218 Merge branch 'master' into hh-annotations
Conflicts:
	assets/scripts/app/controllers/job.coffee
	assets/scripts/app/models/job.coffee
2014-01-24 10:18:58 -05:00
Henrik Hodne
1b8ec432dc Initial annotation support 2013-07-10 17:49:47 -07:00