diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-05-10 11:23:56 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-05-10 11:23:56 +0200 |
| commit | 1f32089ec067611a2824a8ceba68b02d4923aff8 (patch) | |
| tree | d8cf3e0838dde175a6fe60b535f7f3cd70425477 /libs/openpgp-keychain | |
| parent | 3d913c2e0eeb81dc59a7e49229d660b124cee600 (diff) | |
| parent | 0578fb38503b0cb9ec96e6244323d838033da410 (diff) | |
Merge remote-tracking branch 'origin/development' into development
Conflicts:
res/values-es/arrays.xml
res/values-es/strings.xml
Diffstat (limited to 'libs/openpgp-keychain')
0 files changed, 0 insertions, 0 deletions