~checkbox-dev/checkbox/trunk

Viewing all changes in revision 3174.

  • Committer: Daniel Manrique
  • Author(s): Zygmunt Krynicki
  • Date: 2014-08-08 13:57:14 UTC
  • mfrom: (3163.1.1 launchpad/story-1063)
  • Revision ID: daniel_manrique-20140808135714-ry5ir9yy5i16u23s
"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: