~checkbox-dev/checkbox/trunk

Viewing all changes in revision 3060.

  • Committer: Daniel Manrique
  • Author(s): Po-Hsu Lin
  • Date: 2014-06-11 08:56:29 UTC
  • mfrom: (3058.1.1 input-after-s3)
  • Revision ID: daniel_manrique-20140611085629-38qs2nlyh2y1q7gc
"automatic merge by tarmac [r=zkrynicki][bug=1321742][author=cypressyew]"

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: