diff options
| author | Daniel Ramos <hiperzone@gmail.com> | 2015-04-24 03:44:57 +0100 |
|---|---|---|
| committer | Daniel Ramos <hiperzone@gmail.com> | 2015-04-24 03:44:57 +0100 |
| commit | 40122d61ccd13a06602cf614f18aedee82bf1ad0 (patch) | |
| tree | 629cc59b845990ff2aae84f446b40bcccec531ce /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java | |
| parent | 702c28854bf0afe3d7b97e47716530dc751c9322 (diff) | |
| parent | 76841ca873e5ce81d170a21c8d3cc09ce24522ba (diff) | |
| download | open-keychain-40122d61ccd13a06602cf614f18aedee82bf1ad0.tar.gz open-keychain-40122d61ccd13a06602cf614f18aedee82bf1ad0.tar.bz2 open-keychain-40122d61ccd13a06602cf614f18aedee82bf1ad0.zip | |
Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java')
0 files changed, 0 insertions, 0 deletions