aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-05 18:47:04 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-05 18:47:04 +0100
commit777e060100c724da54e5ec4fef15f5c66c271b5e (patch)
treef8756229f091b3401b7c164f950975f045bdda76 /src/main/java/eu
parentfdcbdfdc0500e9cad97d716def5112d2bec91e19 (diff)
parentf2cc70c58c6a50d2d01cba8f1d74ddadb98faf82 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu')
0 files changed, 0 insertions, 0 deletions