~elementary-os/elementaryos/elementary-seeds.xenial

Viewing all changes in revision 2410.

  • Committer: Cody Garver
  • Date: 2016-12-02 13:02:54 UTC
  • mfrom: (2367.1.111 ubuntu.xenial)
  • Revision ID: cody@elementary.io-20161202130254-wh5orvoow2e12mr1
Merge in lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu.xenial and resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: