aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-10-05 13:50:26 +0200
committerlookshe <github@lookshe.org>2015-10-05 13:50:26 +0200
commit5850cbcf9c3e72580f3288c582737a04e8148b79 (patch)
tree1e8b8105296de7af55e8fb3c101bfc00ec611cd1 /src/main/java/eu/siacs
parentef0f8d4507391dafba2fc9d2b691a117e84b40fc (diff)
parent075448f764ba7178b3a02f3cd40941655afe6208 (diff)
Merge branch 'trz/rename' (early part) into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions