~elementary-os/elementaryos/platform.xenial

Viewing all changes in revision 2013.

  • Committer: Cody Garver
  • Date: 2016-06-09 23:35:50 UTC
  • mfrom: (2008.1.53 platform.xenial)
  • Revision ID: cody@elementary.io-20160609233550-iwokrx3dssjr2ph7
Merge in lp:~ubuntu-core-dev/ubuntu-seeds/platform.xenial and resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: