Merge branch '3.0'
authorJoshua Rüsweg <ruesweg@woltlab.com>
Tue, 3 Sep 2019 13:20:22 +0000 (15:20 +0200)
committerJoshua Rüsweg <ruesweg@woltlab.com>
Tue, 3 Sep 2019 13:20:22 +0000 (15:20 +0200)
commitbdeb8813780d7a150d3562cce314a4541bb85d43
tree1caee984f90d46adaea1fd8902c4011a89bf9c69
parent88c0c153f8a9a8026b71b047b75702d15a3cdf9c
parent3bcbb44ce511cdd90626f2f7ec49e11b2bca05d1
Merge branch '3.0'
files/lib/system/event/listener/ConversationUserActionRenameListener.class.php
files/lib/system/event/listener/ConversationUserMergeListener.class.php