aboutsummaryrefslogtreecommitdiffstats
path: root/proguard-project.txt
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-26 10:30:05 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-26 10:30:05 +0200
commit39aeb4cc3df85b591e6bf956a1e881324eea746b (patch)
tree5cf4086e12c998866ad212a6c04da067a9c92c55 /proguard-project.txt
parent0e1c8467a323eabfeb140e62e1249fb4a913fe07 (diff)
parent251b8fd58bf49cdeb69dd8a4309549f2bb25010d (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'proguard-project.txt')
0 files changed, 0 insertions, 0 deletions