~cjwatson/launchpad/isolate-gpgme

Viewing all changes in revision 18265.

  • Committer: Launchpad Patch Queue Manager
  • Date: 2016-11-14 19:55:34 UTC
  • mfrom: (7675.1369.1049 db-merge-fix)
  • Revision ID: launchpad@pqm.canonical.com-20161114195534-udcp0x243tx79mx5
[r=cjwatson][no-qa] Manually merge r18263 from devel to resolve
 criss-cross merge failure.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: