diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-10 11:45:01 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-10 11:45:01 +0200 |
| commit | e6d336c293415f7906e9855c9108986f89eb2d5e (patch) | |
| tree | 191092c8c1e0030e8c87b8d6a41e29b52c788924 /src/main/res | |
| parent | 1e28f600386f1f1dcd734363c932d5ccbd6267fb (diff) | |
| parent | c82cdb36f6358942f987b7acccc3e4b5adf7dd87 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions