diff options
author | Christian S <christian@pix-art.de> | 2016-01-13 17:48:30 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-01-13 17:48:30 +0100 |
commit | 4c2dc7082855581d875c51d97650c7b4a435abe5 (patch) | |
tree | 818ebaea4bfa9743e0acf85abc92afca7b51449a /src/main/res/menu/muc_details_context.xml | |
parent | c133b1d7e1cc9a3a3426d26e35cc038b508e1691 (diff) | |
parent | 3b3aa5b5841494ba02fe327f910558eb40e662b5 (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/menu/muc_details_context.xml')
0 files changed, 0 insertions, 0 deletions