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

Merge branch 'master' into prefs-auto-update 

Conflicts:
	pudb/settings.py
parents 39a7569b 3001703b
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