diff options
| author | kali <kali@leap.se> | 2013-06-12 02:05:05 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-06-12 02:05:05 +0900 |
| commit | 86add779c3e5f869b4bffbb482a4659db30e2cbc (patch) | |
| tree | fc9053fc2af73ac8e6ca6d914f6e69d258fa127e /changes/bug-2640_app-crash-on-wrong-keyring-password | |
| parent | 90fe21d31858f894dfec9bf37f432a7f39dd2b6f (diff) | |
| parent | 029b4c2ac07fab41dbed9ab90e04e477938c3c05 (diff) | |
Merge remote-tracking branch 'chiiph/feature/merge_systray' into develop
Conflicts:
src/leap/gui/mainwindow.py
Diffstat (limited to 'changes/bug-2640_app-crash-on-wrong-keyring-password')
0 files changed, 0 insertions, 0 deletions