Commit Graph

1 Commits

Author SHA1 Message Date
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