aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/crypto/XmppDomainVerifier.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-04-17 17:37:43 +0200
committerlookshe <github@lookshe.org>2016-04-17 17:37:43 +0200
commitad6208e53095e3a9870cdc0eae9b7c068a42829a (patch)
treed5216f567722d4d6a959ab262c6cbef22f1931e7 /src/main/java/de/thedevstack/conversationsplus/crypto/XmppDomainVerifier.java
parent1f81683d26eba69d7e4373bbda6295d5d7843777 (diff)
parentde7631e300eb9e578336d642dd279faecdb09391 (diff)
Merge branch 'trz/rebase' into trz/rename
Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/crypto/XmppDomainVerifier.java')
0 files changed, 0 insertions, 0 deletions