aboutsummaryrefslogtreecommitdiffstats
path: root/src/free/java/eu/siacs
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-08 22:24:47 +0100
committerlookshe <github@lookshe.org>2016-03-08 22:24:47 +0100
commita6442dd3ac1114807d9a50892388a8bd4e69a861 (patch)
tree17256a8e21938932f44130c0a0131b8314d5f260 /src/free/java/eu/siacs
parentb0e651aa93b56dd1ee50fa5cc6d55eb9ba20b81b (diff)
parent4b4ba6cff85c0bc80fa354a70d7b35b4cef9a672 (diff)
Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1
Diffstat (limited to 'src/free/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions