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

Merge remote-tracking branch 'origin/stable' into test/wip-improved-snapshots 

Conflicts:
	features/step_definitions/erase_memory.rb
	features/step_definitions/pidgin.rb
parents 565309f0 5f6065d9
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