← Back to branch summary

~frankban/juju-gui/bug-1074297-charm-panel-description

Viewing all changes in revision 231.

  • Committer: Francesco Banconi
  • Date: 2012-11-07 14:23:48 UTC
  • mfrom: (223.2.4 juju-gui)
  • Revision ID: francesco.banconi@canonical.com-20121107142348-hbu0651f8iqs154a
Merged source and resolved conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: