aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-23 13:41:58 +0100
committerlookshe <github@lookshe.org>2016-03-23 13:41:58 +0100
commit86d16b030b46aca24e6fab38e5d34beb503a6dc7 (patch)
tree0ec47c54eba09753d45ed049f75c6fce7b1a1b2b /src/main/java/eu/siacs/conversations
parentf3bebf59278f835ba928a498e76b76f7f65ee95a (diff)
parentf306292ed68c003621b53065dd70e499e074e748 (diff)
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions