aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-w945dp
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-11 21:34:10 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-11 21:34:10 +0100
commit864bb77883b2f5d9f9122c102faa4af89d589653 (patch)
treec9d7b675da2b5eb38809dabdd599e43ff0acce3b /src/main/res/values-w945dp
parent8585231be2844ab794cfa63454b1013bae8502f6 (diff)
parentbfc5000b6aa3d401ad80e04c43a6671aa9c2c619 (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-w945dp')
0 files changed, 0 insertions, 0 deletions