aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-30 09:24:58 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-30 09:24:58 +0200
commitc494f4f7aeaa9ff07edae1ac09cfca17ca4b05be (patch)
tree4397e785a55a251c85d9f633b8c279df1be520e3 /res/layout
parent9de77b190bc5f92bc2bcdf24ba060d09cc425277 (diff)
parent4435b0055e9a8b8014a89f3bdec602b8106f992e (diff)
Merge branch 'sm' into development
Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions