← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2276.

Committer: Gavin Panella
Date: 2014-07-15 16:49:03 UTC
mfrom: (1745.2.502 maas)
Revision ID: gavin.panella@canonical.com-20140715164903-prxrgcds2324xf4u

Merge trunk r2247.

files modified:
pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/forms_settings.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/tests/test_forms_settings.py

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/forms_settings.py

pkg/maas-region/maasserver/tests/test_forms.py

pkg/maas-region/maasserver/tests/test_forms_settings.py

Older »