~elementary-os/elementaryos/os-patch-grub2-signed-trusty

Viewing all changes in revision 7.

  • Committer: Cody Garver
  • Date: 2015-05-28 16:49:14 UTC
  • mfrom: (1.1.2 grub2-signed-trusty)
  • Revision ID: cody@elementaryos.org-20150528164914-3899cf859lvas49i
Merge in lp:~elementary-os/ubuntu-package-imports/grub2-signed-trusty and resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: