diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-11 21:34:10 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-11 21:34:10 +0100 |
| commit | 864bb77883b2f5d9f9122c102faa4af89d589653 (patch) | |
| tree | c9d7b675da2b5eb38809dabdd599e43ff0acce3b /src/main/res/values-es | |
| parent | 8585231be2844ab794cfa63454b1013bae8502f6 (diff) | |
| parent | bfc5000b6aa3d401ad80e04c43a6671aa9c2c619 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/eu/siacs/conversations/entities/Message.java
Diffstat (limited to 'src/main/res/values-es')
0 files changed, 0 insertions, 0 deletions