aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-02-02 13:56:32 +0100
committeriNPUTmice <daniel@gultsch.de>2015-02-02 13:56:32 +0100
commit206fd3fc4b038edf61a964b8ea6c2321f1b6b2f2 (patch)
treefdac8f5678e15daf5584549976c6708bd8cb619a /src/main/java
parent6674a3d7572ad57c16033d5129c57a4ff0a56c35 (diff)
parent722031ab11a7aa573d40d1c405e6a9d931c036a5 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java')
0 files changed, 0 insertions, 0 deletions