diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-09 21:51:44 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-09 21:51:44 +0100 |
commit | e0219ae4cef0cd1a65e9727a02417de14caa67ff (patch) | |
tree | b9125e2c43b144b75dd862cda1c1b3ac03b32fb3 /libs/emojicon/src/main/res/values | |
parent | 69145c02f2ba357a95b38575bdc0eca40a837bae (diff) | |
parent | 362c00d31b31690b7debebc68213851456b422dd (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'libs/emojicon/src/main/res/values')
0 files changed, 0 insertions, 0 deletions