Merge branch 'master' into Lyberta/RandomItems
authorMario <mario@smbclan.net>
Sat, 25 Nov 2017 03:24:47 +0000 (13:24 +1000)
committerMario <mario@smbclan.net>
Sat, 25 Nov 2017 03:24:47 +0000 (13:24 +1000)
commit6860495bd0cb15353c11be01ad03f052c34b9536
tree57b1fae8a8b076ad9dc66e16ecaeac6c18ed8260
parent755d4886ace93a140689ade65fbce99c10b80ab5
parentda674c235adfdc6b7a33bebb22f42e1be34224e8
Merge branch 'master' into Lyberta/RandomItems

# Conflicts:
# mutators.cfg
mutators.cfg
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/common/stats.qh