aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-17 10:51:28 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-17 10:51:28 +0100
commitc30108eb17eff0e94ad9bbe4392ee193120e8b32 (patch)
tree9cd23a56a552d47aba353a39fbaae03ecf85590f /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parent741a0c129d3558e9b9a714848a590a1f0a499799 (diff)
parent5603440a91e72ac4d5c7043b85ff211425a592b9 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
0 files changed, 0 insertions, 0 deletions