~bac/charms/precise/juju-gui/expose-cookies

Viewing all changes in revision 62.

  • Committer: Brad Crittenden
  • Date: 2013-06-04 16:44:00 UTC
  • mfrom: (61.1.1 add-lbox)
  • Revision ID: bac@canonical.com-20130604164400-zyzxwubn0sjq4px4
Fix the discrepancy between dev and rel branches.

Changes that should've been submitted to the development branch of the gui
(lp:~juju-gui/charms/precise/juju-gui/trunk) were instead merged into the
release branch (lp:charms/juju-gui).

This branch merges those changes back into devel for on-going work.  The
premature release will remain in place.

R=teknico
CC=
https://codereview.appspot.com/9975046

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: