Merge branch 'master' into terencehill/less_fields 659/head
authorMario <mario@smbclan.net>
Thu, 29 Aug 2019 05:44:29 +0000 (15:44 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Aug 2019 05:44:29 +0000 (15:44 +1000)
commitcbb0a16ac5554caedc4af3d81ff857c40eb9bdb9
tree342bb3fb20ff3fb418fc4eba84ff0ea343d0ecf9
parent8da518254d6aa14a95a132175bd4331a945cc876
parent062b4c4b51d8cb2acb3744f3b96a47427bd421f5
Merge branch 'master' into terencehill/less_fields

# Conflicts:
# qcsrc/common/notifications/all.qh
qcsrc/common/notifications/all.qh
qcsrc/server/client.qh