summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMaxime Buquet <pep@bouah.net>2020-05-24 17:13:51 +0200
committerMaxime Buquet <pep@bouah.net>2020-05-24 17:13:51 +0200
commitdd0be85dceb4881d7100a4ef9522370c0c1b92e7 (patch)
treecde3a564d68cb5d6cad115e4db20dd61031282db /Makefile
parent0c9f2ca39150a19c9120a6f050fe3a6db82de938 (diff)
parent6117c97a214acb396b21bd7954dfc6bb5e9f97f4 (diff)
downloadpoezio-dd0be85dceb4881d7100a4ef9522370c0c1b92e7.tar.gz
poezio-dd0be85dceb4881d7100a4ef9522370c0c1b92e7.tar.bz2
poezio-dd0be85dceb4881d7100a4ef9522370c0c1b92e7.tar.xz
poezio-dd0be85dceb4881d7100a4ef9522370c0c1b92e7.zip
Merge branch 'affiliation-info' into 'master'
Make /affiliation display in the info win, not in the muc win See merge request poezio/poezio!113
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions