diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-20 19:49:33 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-20 19:49:33 +0200 |
| commit | 545cad41e6be6a2a07cf3fc5824509514e758df7 (patch) | |
| tree | e7b6a79e57df7c4e558f30c922518d32b6574c9d /custom_rules.xml | |
| parent | 49b7c7779da38c215dfeb0b3ef19fbce2a6ea3e1 (diff) | |
| parent | b16bc24c7124ac0cb9f02931cc3ba228a3396935 (diff) | |
Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development
Conflicts:
res/values-eu/strings.xml
Diffstat (limited to 'custom_rules.xml')
0 files changed, 0 insertions, 0 deletions