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

Merge branch 'master' of github.com:inducer/pudb 

Conflicts:
	pudb/settings.py
parents 5cbd3391 85f5b461
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment