diff options
author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-07-31 14:52:06 -0300 |
---|---|---|
committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-07-31 14:52:06 -0300 |
commit | 429cc2681e74785e3e88b270730e246f3f9f3ce7 (patch) | |
tree | 8aa9f8a1a9c1f77098337442eac77d52c720b214 /src/leap/bitmask/gui/ui/preferences.ui | |
parent | 87869ff34efce43a331d238db64b768b616b129a (diff) | |
parent | 75eddcf502d23f761cbac26da34fcfd1ab669b8b (diff) |
Merge remote-tracking branch 'chiiph/bug/properly_enable_keyring' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/preferences.ui')
0 files changed, 0 insertions, 0 deletions