aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-19 20:21:25 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-19 20:21:25 +0200
commit2a1067b20a5c5b1948550e5370d3d8f02b2c557b (patch)
tree662d397934c2da03a4d1b6dbfaaf1a6f0cb9f71b /res/values
parent7994b6866b7de4b266cf61d69e6c15c84bfd9c3a (diff)
parenta6f9a742c0dffeaa2f7fc26ad65e9c972a9d2288 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/values')
0 files changed, 0 insertions, 0 deletions