diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-11-03 21:33:14 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-11-03 21:33:14 +0100 |
commit | 0575767152abc391fd1d0241d9cbae154236df70 (patch) | |
tree | d4530ebbdb2de9ed0f0c41eb008a712edba6d7f6 /src/main/java/eu/siacs/conversations/ui/TimePreference.java | |
parent | 389e3d4f0f5116f5ea22cc7c5e8cec1e6c791e3a (diff) | |
parent | b22d863c362bb6492240700c0f69f1a5d926f46b (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/TimePreference.java')
0 files changed, 0 insertions, 0 deletions