Bruno Oliveira
|
4fa2294805
|
Merge remote-tracking branch 'origin/master' into layout
Conflicts:
qutebrowser/test/keyinput/test_basekeyparser.py
qutebrowser/test/utils/test_standarddir.py
test/browser/http/test_content_disposition.py
test/config/test_configtypes.py
test/misc/test_editor.py
test/utils/test_debug.py
test/utils/test_utils.py
tox.ini
|
2015-04-04 14:29:49 -03:00 |
|