Skip to content
Commit fbd2e79b authored by Patrik Dufresne's avatar Patrik Dufresne
Browse files

Merge branch 'develop/patrik/remove-plugins' 

Conflicts:
	README.md
	rdiffweb/librdiff.py
parents 83ef11fc 153e6978
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