Ryan Roden-Corrent 71b71dbc58 Merge remote-tracking branch 'upstream/master' into HEAD		2017-08-06 18:13:49 -04:00
..
end2end	Merge remote-tracking branch 'upstream/master' into HEAD	2017-08-06 18:13:49 -04:00
helpers	Merge remote-tracking branch 'upstream/master' into HEAD	2017-08-06 18:13:49 -04:00
manual	Update some more references to old config options	2017-07-04 16:46:02 +02:00
unit	Merge remote-tracking branch 'upstream/master' into HEAD	2017-08-06 18:13:49 -04:00
conftest.py	Merge remote-tracking branch 'upstream/master' into HEAD	2017-08-06 18:13:49 -04:00
test_conftest.py	Finally update copyrights...	2017-05-09 21:37:03 +02:00