aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-06 18:33:56 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-06 18:33:56 +0100
commit8a3ccfd456eb96a77a30c26113aecf55dccde536 (patch)
treebbf0897f3b3776917fabce982cb3254526674dfd /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
parent562699c7458a2acda942b8a6fe7e0bed4032309c (diff)
parent352af145f83607e24a5115021e0f07f6e3471518 (diff)
Merge pull request #841 from BenoitBouvarel/patch-2
Update strings.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java')
0 files changed, 0 insertions, 0 deletions