Skip to content
Commit cf6e0447 authored by anonym's avatar anonym
Browse files

Merge branch 'testing' into test/10443-pidgin-oftc-tests-are-fragile 

Conflicts:
	features/pidgin.feature
parents bb29d26c 9e656c08
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment