diff options
| author | Christian S <christian@pix-art.de> | 2016-01-16 10:59:08 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-16 10:59:08 +0100 |
| commit | 7b6b95caaf193af019b0d606a020a42094db26fa (patch) | |
| tree | 70d9903a8d8bea826826747d4d4687344c4d85e7 /src/main/res/layout/enter_jid_dialog.xml | |
| parent | 188e0a118cd0d9d0e009f4b0b062165f60f1a3da (diff) | |
| parent | ca7b3978281451287c052f1c8bc58de85eff6f35 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/layout/enter_jid_dialog.xml')
0 files changed, 0 insertions, 0 deletions