Merge branch 'master' into 1.0.x
Conflicts: plugins/Blacklist/BlacklistPlugin.php
Showing
scripts/joingroup.php
0 → 100644
scripts/leavegroup.php
0 → 100644
Please register or sign in to comment
Conflicts: plugins/Blacklist/BlacklistPlugin.php
git.gnu.io is graciously hosted by the Free Software Foundation. https://donate.fsf.org