Merge remote-tracking branch 'upstream/master' into release-3.5.0

Browse Source

...

This commit is contained in:

Bruno Oliveira

2018-03-21 20:39:44 +00:00

parent 6f95189cf7 672239b149

commit f3c87a77a7

8 changed files with 3 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

doc/en/example/assertion/global_testmodule_config/test_hello.py → doc/en/example/assertion/global_testmodule_config/test_hello_world.py

0

doc/en/example/costlysetup/sub1/__init__.py → doc/en/example/costlysetup/sub_a/__init__.py

0

doc/en/example/costlysetup/sub1/test_quick.py → doc/en/example/costlysetup/sub_a/test_quick.py

0

doc/en/example/costlysetup/sub2/__init__.py → doc/en/example/costlysetup/sub_b/__init__.py

0

doc/en/example/costlysetup/sub2/test_two.py → doc/en/example/costlysetup/sub_b/test_two.py