Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorMarcel Werk <burntime@woltlab.com>
Mon, 12 Mar 2018 11:16:03 +0000 (12:16 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 12 Mar 2018 11:16:03 +0000 (12:16 +0100)
commit66aca7629cd2791f3d67f5bda2932030187e67d7
tree41c7dc4990a956e3e9880c5b084e0b0c898b7562
parent186a9c7475a2dfdc5ef4d9bf0c49b451599d01d3
parent36b9dee019dbfc931b679fd5f89c0a4608949304
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:
# templates/conversation.tpl
templates/conversation.tpl