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

Merge branch 'stable' 

Fixes gh-45.

Conflicts:
	src/recovery.cc
parents f67634c4 41985b15
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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