diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-08 23:34:56 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-08 23:35:59 +0100 |
| commit | 07c2aba59b0ec0fd492621406d08ce33e23ad7ad (patch) | |
| tree | e9c0a521101d956d7f83f4f6104c3aaa82de12e6 /src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java | |
| parent | a6442dd3ac1114807d9a50892388a8bd4e69a861 (diff) | |
| parent | 9af0794911b7993b612d23b3851fc5f5754bb2a0 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
build.gradle
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java')
0 files changed, 0 insertions, 0 deletions