aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-11 23:51:10 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-11 23:51:10 +0100
commit3041cc74cefb4a25f4d1af7109fcb141ec3293d8 (patch)
tree8eee0b9b56dd6ccbdecc2029a09166f9baf571a0 /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
parent864bb77883b2f5d9f9122c102faa4af89d589653 (diff)
parenta4444026444c75678db1663e01de05df225cd9ed (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions