diff options
author | Kali Kaneko <kali@leap.se> | 2014-11-03 12:13:46 +0100 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2014-11-03 12:13:46 +0100 |
commit | 0fc71d08381c7e750dabc2fc6cf5ef957d51bb5a (patch) | |
tree | 907c872b37be164b7095fbf97a2d466b59b31b7e /src/leap/bitmask/gui/ui/preferences_email_page.ui | |
parent | fa5fe88d47dd3e90d8336dbd56e9bf6b38acd811 (diff) | |
parent | 7b0dda2fde310fff5ea6ee57a5f18a554b8e665f (diff) |
Merge tag '0.7.0rc3' into deb-0.7.1-rc3
Tag leap.bitmask version 0.7.0rc3
Conflicts:
src/leap/bitmask/services/soledad/soledadbootstrapper.py
Diffstat (limited to 'src/leap/bitmask/gui/ui/preferences_email_page.ui')
-rw-r--r-- | src/leap/bitmask/gui/ui/preferences_email_page.ui | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui index 41b3c28d..7cc5bb3c 100644 --- a/src/leap/bitmask/gui/ui/preferences_email_page.ui +++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui @@ -13,19 +13,6 @@ <property name="windowTitle"> <string>Form</string> </property> - <widget class="QPushButton" name="pushButton"> - <property name="geometry"> - <rect> - <x>250</x> - <y>210</y> - <width>98</width> - <height>27</height> - </rect> - </property> - <property name="text"> - <string>PushButton</string> - </property> - </widget> </widget> <resources/> <connections/> |