aboutsummaryrefslogtreecommitdiffstats
path: root/project.properties
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-06 18:21:38 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-06 18:21:38 +0200
commit9a945af6b9df40102402f593f57c125fc005f04e (patch)
tree0e8068fc36fc1f3a8359982b02872407a591ad87 /project.properties
parent0e5a0a07fd32d185d2d4c43df9494fafcace9208 (diff)
parentdfc5942bda1088e75d1ad3bae8af4810e6a5aceb (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'project.properties')
0 files changed, 0 insertions, 0 deletions