← Back to branch summary

~frankban/charms/precise/juju-gui/guiserver-bundles-integration

~frankban/charms/precise/juju-gui/guiserver-bundles-integration

Viewing all changes in revision 138.

Committer: Francesco Banconi
Date: 2013-08-26 08:07:36 UTC
mfrom: (89.2.6 trunk)
Revision ID: francesco.banconi@canonical.com-20130826080736-468p6qnw6rsqygj9

Merged trunk.

files modified:
server/guiserver/bundles/base.py

server/guiserver/tests/bundles/test_base.py

server/guiserver/tests/bundles/test_blocking.py

server/guiserver/tests/helpers.py

Show diffs side-by-side

added added

removed removed

server/guiserver/bundles/base.py

server/guiserver/tests/bundles/test_base.py

server/guiserver/tests/bundles/test_blocking.py

server/guiserver/tests/helpers.py

Older »