← Back to branch summary

~jonas-drange/ubuntu-system-settings/fix-1441192

~jonas-drange/ubuntu-system-settings/fix-1441192

Viewing all changes in revision 1383.

Committer: jonas-drange
Date: 2015-05-21 12:05:04 UTC
mfrom: (1376.10.10 ubuntu-system-settings)
Revision ID: jonas.drange@canonical.com-20150521120504-za9z0kuaofus75cl

merge trunk

files modified:
debian/changelog

plugins/battery/PageComponent.qml

plugins/security-privacy/LockSecurity.qml

plugins/security-privacy/PhoneLocking.qml

plugins/system-update/PageComponent.qml

po/cs.po

po/hu.po

po/pt.po

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_security.py

Show diffs side-by-side

added added

removed removed

debian/changelog

plugins/battery/PageComponent.qml

plugins/security-privacy/LockSecurity.qml

plugins/security-privacy/PhoneLocking.qml

plugins/system-update/PageComponent.qml

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_security.py

Older »