Skip to content
Snippets Groups Projects
Commit faf7a524 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Merge branch 'stable' 

Conflicts:
	src/palloc.cc
parents 55981673 d9cba2b7
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