aboutsummaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-17 20:41:33 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-17 20:41:33 +0200
commit2abb57be34effbb0606ae099bfefee472542662e (patch)
tree8b2f26187a2dd6d311618864eb03c7db718eb7c9 /AndroidManifest.xml
parent813896dbc9229c29b09798a296553a7d8caf07c6 (diff)
parent736e09fbb56fbdc4aca4e9bdc9875a5df60cb562 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions