diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-01 12:33:03 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-01 12:33:03 +0100 |
commit | d1fc90f9810832d812c3cf5525c9a5ce27619bdd (patch) | |
tree | d9e14769dff7939ce33f07d0e633ff4e212e9ad1 /src/main/res/values | |
parent | 336daea875a6aa864df77b121843aea2e1892d2f (diff) | |
parent | 19c2ca520c703576bfbf68626051fe5faab6362f (diff) |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/res/values')
0 files changed, 0 insertions, 0 deletions