diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-04-01 23:24:35 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-04-01 23:24:35 +0200 |
| commit | cb29c5bb15c31d4b2cde81ba91d89e11518578b4 (patch) | |
| tree | c0375d3a358f8f3d5ddaf3f0b73e07d34da65e67 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | 1a376cacaca2ff3199624e791d1f4990196297fd (diff) | |
| parent | e64049c4fc0f4514dee011a1f616ea4bdff1f16a (diff) | |
Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
0 files changed, 0 insertions, 0 deletions