Merge branch '3.0' into 3.1
authorAlexander Ebert <ebert@woltlab.com>
Sun, 12 Apr 2020 22:39:48 +0000 (00:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 12 Apr 2020 22:39:48 +0000 (00:39 +0200)
commitba70e5edee10e1b38c8b6fa6a39e0f5812159b08
tree179da211b0c9f49f2f75e6f818dda2f4ec6b96ee
parent6da56fec1a058aba3a6366868cdfeaa1f3cddceb
parent8674cea04e285980b573be12407a032a7cf11d5f
Merge branch '3.0' into 3.1
files/lib/form/ConversationAddForm.class.php
files/lib/system/conversation/ConversationHandler.class.php
language/de.xml
language/en.xml
userGroupOption.xml