aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp
diff options
context:
space:
mode:
authorChristian S. <kriztan@users.noreply.github.com>2015-07-23 14:13:17 +0200
committerChristian S. <kriztan@users.noreply.github.com>2015-07-23 14:13:17 +0200
commitd4177adebfdd009b6adbcc3a08646f3ddf3e0b09 (patch)
treec8b926e46cbc3803d50b5caa470de31523d749c0 /src/main/java/eu/siacs/conversations/xmpp
parentad3632964e64cbcad72aa855496f32d769dfb001 (diff)
parent2b68543c89130141e698911b01d00921e8ac2973 (diff)
Merge pull request #16 from kriztan/development
Update CHANGELOG.md
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
0 files changed, 0 insertions, 0 deletions