diff options
| author | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 02:39:39 +0100 |
|---|---|---|
| committer | Tristan Zur <tristan.zur@ccwn.org> | 2015-01-11 02:39:39 +0100 |
| commit | e8ca2a1ae3259c66991f69d62c470ca611ee4659 (patch) | |
| tree | ec743af03426e3beda883a015076c55cf1ff7117 /src/main/java/eu/siacs/conversations/Config.java | |
| parent | 5a860416b502833b445f10cea004735910ef0986 (diff) | |
| parent | 71bb1e90b0656fe5caa32b34cb5798855d6cc425 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
0 files changed, 0 insertions, 0 deletions