diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-10-16 16:06:51 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-10-16 16:06:51 +0200 |
| commit | 0a5a985cbe582e6f7ece37ec257fe53ccee4bb42 (patch) | |
| tree | 54b5392837032a2bf1a060b60ee92ed7669f899b /src/main/java/de/tzur/conversations/Settings.java | |
| parent | e891f076f2b479146fc7ecce3763bf500919df43 (diff) | |
| parent | 0759a78727c1c36e621951a791b959c26d34f509 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/tzur/conversations/Settings.java')
0 files changed, 0 insertions, 0 deletions