aboutsummaryrefslogtreecommitdiffstats
path: root/src/free/java/eu/siacs
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-12-02 14:01:26 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-12-02 14:01:26 +0100
commit599f7dad2c994e91a2a42def38c02785e099830d (patch)
treedb4878c5cb34796f33e305b158265d5dafd9d115 /src/free/java/eu/siacs
parentd4b1119240acf86dd1051adff7c9b42de7bb2a1d (diff)
parentf4a769080b70571a2805ea53d712bb350cfacb63 (diff)
Merge branch 'feature-quotation' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-quotation
Diffstat (limited to 'src/free/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions