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

Merge remote-tracking branch 'origin/master' into

develop/patrik/remove-plugins

Conflicts:
	rdiffweb/librdiff.py
	rdiffweb/tests/test_librdiff.py
parents d4553f22 d41ca646
Pipeline #144874633 passed with stages
in 55 minutes and 11 seconds
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