← Back to branch summary

~bcsaller/juju-gui/service-click-actions-begone

~bcsaller/juju-gui/service-click-actions-begone

Viewing all changes in revision 353.

Committer: Benjamin Saller
Date: 2013-01-31 02:59:16 UTC
mfrom: (342.1.16 juju-gui)
Revision ID: bcsaller@gmail.com-20130131025916-4njzgas2bnq3c4nl

merge trunk

files modified:
HACKING

Makefile

README

app/app.js

app/models/charm.js

app/store/env.js

app/views/charm-panel.js

app/views/environment.js

app/views/topology/relation.js

app/views/topology/service.js

app/views/topology/topology.js

app/views/topology/viewport.js

docs/index.rst

docs/style-guide.rst

lib/merge-files.js

package.json

test/test_environment_view.js

test/test_service_module.js

Show diffs side-by-side

added added

removed removed

app/models/charm.js

app/store/env.js

app/views/charm-panel.js

app/views/environment.js

app/views/topology/relation.js

app/views/topology/service.js

app/views/topology/topology.js

app/views/topology/viewport.js

docs/style-guide.rst

lib/merge-files.js

test/test_environment_view.js

test/test_service_module.js

Older »