Commit Graph

4 Commits

Author SHA1 Message Date
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
Bruno Oliveira
12903a34f4 Converted test_modeparsers to pytest 2015-04-04 13:02:31 -03:00
Bruno Oliveira
7e7a1b7b28 Converted test_basekeyparser to pytest 2015-04-04 12:37:14 -03:00
Bruno Oliveira
9c533e1941 Moved tests to outside of qutebrowser package 2015-04-03 16:49:01 -03:00