~mzanetti/ubuntu-ui-toolkit/nonsquareicons-trunk

Viewing all changes in revision 1163.

  • Committer: Michael Zanetti
  • Date: 2015-02-23 12:51:49 UTC
  • Revision ID: michael.zanetti@canonical.com-20150223125149-jgat5hxtmhu5yw8p
fix bad merge

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: