aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-11-24 06:51:52 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-11-24 06:51:52 +0100
commit8a1c4fe69ea1095ceef306554c7d5686796cccdb (patch)
treeeb94cdbe9ce86917dc1ad587c5420475e49a68fd /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parentc6e54e7e5a3e402553d2f57e2997fb80d029d559 (diff)
parent2c1f7e115cd97259afe01f24e14f28b05ef6c9d9 (diff)
Merge pull request #1570 from fiaxh/pgp_pgpengine_nullpointer_fix
PGP fix
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
0 files changed, 0 insertions, 0 deletions