aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-29 22:38:11 +0200
committersteckbrief <steckbrief@chefmail.de>2016-03-29 22:38:11 +0200
commit074ff79fd9a6775157c5c4ed106ece86e0c912c2 (patch)
treebeceb80779946decd8458910b6864c83a67e93d2 /src
parenta0c4b022de514ef0334b8aa28662338519eb2071 (diff)
parent37c5a7c5224890e24363c991f48ac316aae6af14 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts: src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions