Skip to content
Commit 2149f74c authored by Michael Gratton's avatar Michael Gratton
Browse files

Merge branch 'wip/794174-conversation-monitor-max-cpu'. Fixes Bug 794174.

parents 15748cef 3bf2ac18
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