diff options
| author | lookshe <github@lookshe.org> | 2015-06-19 23:05:08 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-06-19 23:05:08 +0200 |
| commit | 92864c6696cf776de356f5e9bbe403a691c8746d (patch) | |
| tree | dd6fa0fe95f88977b2c92f8bb75b3417f1edfdd2 /libs | |
| parent | 5586c90e1a063066f07a7f06275bb67bd819b18c (diff) | |
| parent | a7121b51b8239a695dc685adaaf207d61170fee4 (diff) | |
Merge branch 'trz/rename' (early part) into trz/master
Conflicts:
src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions