aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-20 15:14:42 +0100
committerlookshe <github@lookshe.org>2016-03-20 15:14:42 +0100
commit50dad467eeb63e767777733e9b280864f16e81f7 (patch)
tree2b73032bae17a18be9f638d42943d7d2f01baed8 /src/main/java/eu/siacs
parentd535496598ef2d294a375b117b20e4a54e1da2d3 (diff)
parent89082f1c68fb60cf6e7c1d8533696976377fcfde (diff)
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions