diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-15 00:12:47 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-15 00:12:47 +0200 |
| commit | 6376e5fd74dd199b5ab0f71686adff65c05798a6 (patch) | |
| tree | 14979a4f3428fdb77b56b01bc2aff9d308eb1e5e /src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java | |
| parent | 977a770b818d9b40a93d2acd13b6b5d5c874172d (diff) | |
| parent | 018f978a22b7314b21b83c40d8741a811ffc55bf (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java')
0 files changed, 0 insertions, 0 deletions