aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-03 21:22:26 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-03 21:22:26 +0100
commit08cb23a88675bec7a382a8cdd463e9ea10358f64 (patch)
tree60745da206ddc791e5711eed9e448cc363dd30df /src/main/java/eu/siacs
parent7d7be8efd8eef3b9fcadf83766dd26fb139e0976 (diff)
fixed merge errornfc
Diffstat (limited to 'src/main/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions