Skip to content
Commit 9f04a9f3 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into resize 

Conflicts:
	pudb/debugger.py
	pudb/settings.py
parents ab6139dc 2b350662
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