Skip to content
Snippets Groups Projects
Commit 0896a39e authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge remote-tracking branch 'origin/stable' 

Conflicts:
	src/CMakeLists.txt
	src/lua/init.cc
	src/lua/log.lua
parents bcd13810 fae2bbf6
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment