]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Merge branch 'master' into master
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>
Wed, 4 Nov 2020 15:57:47 +0000 (16:57 +0100)
committerGitHub <noreply@github.com>
Wed, 4 Nov 2020 15:57:47 +0000 (16:57 +0100)
1  2 
src/script/lua_api/l_client.cpp
src/script/lua_api/l_localplayer.cpp

Simple merge
Simple merge