satoru
3c8222f1db
Highlight the path of file location in error report
...
So that it's more obvious when we need to copy the file path.
2016-08-01 17:42:20 -03:00
Bruno Oliveira
5565c1f4ae
Sort link refs in CHANGELOG
2016-07-26 20:11:49 -03:00
Bruno Oliveira
c2864aba3d
Merge branch 'master' into merge-master
...
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/monkeypatch.py
# _pytest/python.py
2016-07-25 19:06:29 -03:00
Bruno Oliveira
9cf09cda7b
Remove some comments and improved changelog
2016-07-25 18:41:03 -03:00
Bruno Oliveira
d911bfcb8a
Merge branch 'issue634-scopes' of https://github.com/Stranger6667/pytest
...
# Conflicts:
# CHANGELOG.rst
2016-07-25 18:26:50 -03:00
Bruno Oliveira
8f29ce26e9
Merge branch 'mark_missing_fixture_error' of https://github.com/eolo999/pytest
2016-07-25 18:20:17 -03:00
Dmitry Dygalo
d72afe7e08
Fixed scope override inside metafunc.parametrize. Fixes #634
2016-07-25 12:42:50 +02:00
Roberto Polli
ab6aef1d1f
feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.
2016-07-25 12:41:58 +02:00
Dmitry Dygalo
f7ad173fee
Fixed collection of classes with custom ``__new__`` method
2016-07-25 11:33:37 +02:00
Florian Bruhin
a309a571d9
Cleanups for #1763
2016-07-25 10:17:46 +02:00
Edoardo Batini
e9d729bd46
drop parenthesis around GH issue number
2016-07-25 10:11:37 +02:00
Bruno Oliveira
a24146dd3c
Merge pull request #1757 from tramwaj29/improved-message-when-not-using-parametrized-variable
...
Improved message when not using parametrized variable
2016-07-24 13:02:03 -03:00
Tom Viner
42adaf5a61
Fix #1210 display msg for early calls to exit
2016-07-24 14:16:34 +02:00
JJ
4aede6faa6
fixed conflicts
2016-07-24 12:10:32 +02:00
JJ
d000f2536a
added a test for when the indirect is just a string
2016-07-24 10:47:06 +02:00
Edoardo Batini
0ae77be9f0
Add new target links in CHANGELOG
2016-07-24 00:46:06 +02:00
Daniel Hahler
5c5d7e05f7
Followup to #1718 : style/formatting
2016-07-24 00:21:42 +02:00
Edoardo Batini
f450e0a1db
Thanks to Tom Viner for his guidance during EuroPython2016 sprint
2016-07-24 00:06:16 +02:00
Edoardo Batini
fabe8cda2f
Thanking myself in CHANGELOG
2016-07-23 23:59:34 +02:00
Edoardo Batini
3c4158ac35
Add changelog entry for this bugfix branch
2016-07-23 23:51:11 +02:00
JJ
bbc7f3a631
updated changelog, resolve #1539
2016-07-23 16:57:49 +02:00
Romain Dorgueil
922a295729
fixes changelog, I think I got it
2016-07-23 15:15:17 +02:00
Romain Dorgueil
014ebc9202
Removed bug reference in changelog because it makes the linting fail.
2016-07-23 15:04:19 +02:00
Romain Dorgueil
fd8e019cc1
Choose the doctest output format in case of failure, still work in progress as a few checks fail (related to #1749 )
2016-07-23 14:40:46 +02:00
Javi Romero
1aab6e3bc2
Add changes to changelog.
2016-07-22 12:54:42 +02:00
Bruno Oliveira
4f2bf965cb
Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures
2016-07-20 21:16:27 -03:00
Bruno Oliveira
20f97c3041
Small documentation improvements
2016-07-20 20:22:28 -03:00
Bruno Oliveira
e0f08a73ab
Merge branch 'features' into conftest-exception-printing
2016-07-20 19:33:36 -03:00
Ronny Pfannschmidt
0403266bf0
record --exitfirst change in changelog
2016-07-20 17:23:07 +02:00
Ronny Pfannschmidt
9af872a230
update changelog
2016-07-19 20:11:47 +02:00
Ronny Pfannschmidt
8a73a2ad60
Merge pull request #1734 from nicoddemus/issue-1728-inconsistent-setup-teardown
...
setup_* and teardown_* functions argument now optional
2016-07-15 14:59:22 +02:00
Bruno Oliveira
ff8fb4950e
setup_* and teardown_* functions argument now optional
...
setup_module, setup_function and setup_method
extra argument are now optional and may be omitted.
Fix #1728
2016-07-14 23:41:40 -03:00
Floris Bruynooghe
d1852a48b7
Remove assertion reinterpretation
...
The assertion reinterpretation is an old backwards compatibility
mode which was no longer being maintained on feature-parity with
the assertion rewriting mode. It was also responsible for some
dubious patching of builtins and test with side-effects would
suddenly start passing. Since re-writing has been the default for
a long time and plugins are now also re-written it is time to
retire reinterpretation.
2016-07-15 00:33:39 +01:00
Floris Bruynooghe
24fbbbef1f
Merge pull request #1641 from flub/rewrite-plugins
...
Rewrite plugins
2016-07-14 19:39:15 +01:00
Florian Bruhin
691dc8bc68
Merge pull request #1727 from nicoddemus/deprecate-str-pytest-main
...
Deprecate support for passing command-line as string to pytest.main()
2016-07-14 14:42:14 +02:00
Bruno Oliveira
02dd7d612a
Remove duplicated changelog entry and formatting fix
2016-07-14 08:16:27 -03:00
Bruno Oliveira
ab0b6faa5f
Deprecate support for passing command-line as string to pytest.main()
...
Fixes #1723
2016-07-14 08:11:43 -03:00
Bruno Oliveira
1266ebec83
Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default
...
# Conflicts:
# CHANGELOG.rst
# testing/test_terminal.py
2016-07-13 18:45:15 -03:00
Floris Bruynooghe
a98e3cefc5
Enable re-writing of setuptools-installed plugins
...
Hook up the PEP 302 import hook very early in pytest startup so
that it gets installed before setuptools-installed plugins are
imported. Also iterate over all installed plugins and mark them
for rewriting. If an installed plugin is already imported then
a warning is issued, we can not break since that might break
existing plugins and the fallback will still be gracefull to
plain asserts.
Some existing tests are failing in this commit because of the new
warning triggered by inline pytest runs due to the hypothesis
plugin already being imported. The tests will be fixed in the next
commit.
2016-07-13 17:29:19 +01:00
Bruno Oliveira
4a763accc5
Improve overall CHANGELOG formatting and consistency for 3.0
2016-07-13 08:52:36 -03:00
Kalle Bronsen
dfe1209d2c
De-404 links in changelog
2016-07-13 11:41:27 +02:00
Ronny Pfannschmidt
c4f20a1834
Merge pull request #1712 from anntzer/custom-debugger
...
Allow passing a custom Pdb subclass via --pdbcls.
2016-07-12 16:45:07 +02:00
Antony Lee
7ee3dd1cb5
Add tests for custom pdb class.
...
(and edit CHANGELOG)
2016-07-11 20:07:29 -07:00
Bruno Oliveira
458ecae1df
Replace all usages of "pytest_funcarg__" for @pytest.fixture
2016-07-11 22:21:52 -03:00
Bruno Oliveira
ad4125dc0d
Deprecate "pytest_funcarg__" prefix to declare fixtures
...
Fixes #1684
2016-07-11 22:21:50 -03:00
Bruno Oliveira
5506dc700c
Deprecate yield tests
...
Closes #16
Closes #1324
2016-07-11 22:21:49 -03:00
Bruno Oliveira
2ffe354f21
Add CHANGELOG for invocation-scoped fixtures
2016-07-11 20:32:59 -03:00
Antony Lee
6383b53ad9
Allow passing a custom Pdb subclass via --pdbcls.
...
This obviates the need for plugins such as `pytest-ipdb`; instead one
can simply call `py.test --pdb=IPython.core.debugger:Pdb`
2016-07-09 21:10:52 -07:00
Florian Bruhin
668ebb102c
Clean up changelog
...
- Merged 3.0 and 2.10 as much stuff from the sprint went to the 2.10
section.
- Cleaned up mixture of link/text blocks
- Moved some entries to "Bug Fixes" and "Incompatible changes"
- Stop doing "Fixes (#123 ) ..." because it looks weird
- Add some new empty points for all sections
2016-07-08 18:51:26 +02:00
Ronny Pfannschmidt
dad6aa8a16
fix duplicate target in changelog
2016-07-06 13:51:13 +02:00
Ronny Pfannschmidt
b9a91dc112
merge from master to features
2016-07-06 11:51:48 +02:00
aostr
94e4a2dd67
* implemented changes recommended by nicoddemus
2016-07-05 15:22:27 +02:00
Javier Domingo Cansino
0171cfa30f
Fixing link to issue and creating testcase that shows that it finds the line in the stderr lines
2016-07-05 10:39:12 +01:00
Javier Domingo Cansino
61e605f60b
Making conftest import failures easier to debug
2016-07-05 10:04:42 +01:00
Steffen Allner
b650c3c118
Implement --setup-show cli flag
...
to also be able to see fixture setup with normal test execution.
2016-07-03 22:30:51 +02:00
Ronny Pfannschmidt
7dc8d1ab60
fix typo and remove python3.2 from readme
2016-06-27 18:19:00 +02:00
Ronny Pfannschmidt
e877e25587
drop python 3.0-3.2 support code from setup.py
...
addresses #1627
2016-06-27 17:55:37 +02:00
Bruno Oliveira
44695ae46c
Fix CHANGELOG: obestwalter appearing twice due to mergig separate PRs
2016-06-26 23:44:07 +02:00
Bruno Oliveira
22c2d87633
Fix bad merge in CHANGELOG
2016-06-26 21:18:01 +02:00
Bruno Oliveira
5891061ac1
Merge pull request #1675 from kvas-it/issue-1562
...
Add warning for assertions on tuples #1562
2016-06-26 16:09:15 -03:00
Bruno Oliveira
48ac1a0986
Merge branch 'remove-old-entry-points' into features
2016-06-26 20:38:59 +02:00
Bruno Oliveira
b9536608c5
Add issue and obestwalter to CHANGELOG
...
Fix #1632
2016-06-26 20:36:04 +02:00
Bruno Oliveira
f7a2048e96
Merge branch 'features' of https://github.com/Avira/pytest into remove-old-entry-points
2016-06-26 20:32:38 +02:00
Bruno Oliveira
7239f36466
Improve formatting in CHANGELOG
2016-06-26 19:41:01 +02:00
RedBeardCode
0e2ebc96ff
Remove deprecated cmd options
...
Fixes #1657
2016-06-26 19:26:04 +02:00
aostr
b4e0fabf93
* added missing link to the referenced issue
2016-06-26 06:52:50 +02:00
Vasily Kuznetsov
0db4ae15a9
Update changelog
2016-06-25 19:34:55 +02:00
aostr
e04d9ff80b
* now showing pytest warnings summary by default.
...
* added ``--disable-pytest-warnings` flag to let users disable the warnings summary.
* extended/changed unit tests for the changes in the pytest core.
2016-06-25 18:16:13 +02:00
RedBeardCode
e2f550156e
Improve of the test output for logical expression with brackets.
...
Fixes #925
2016-06-25 18:10:36 +02:00
Ted Xiao
856e6cab75
add --override-ini option to overrides ini values
...
Signed-off-by: Ted Xiao <xiao.xj@gmail.com>
2016-06-25 23:45:32 +08:00
holger krekel
13a188fe37
Merge pull request #1647 from sallner/features
...
Add new options to report fixture setup and teardown
2016-06-25 16:38:37 +02:00
Oliver Bestwalter
3a9e9fdf82
rephrase changes in CHANGELOG.rst
2016-06-25 16:04:23 +02:00
Oliver Bestwalter
72450408ed
add changes in CHANGELOG.rst
2016-06-25 16:00:49 +02:00
Ronny Pfannschmidt
2af3a7a9d7
Merge pull request #1519 from omarkohl/pytest_skip_decorator
...
Raise CollectError if pytest.skip() is called during collection
2016-06-25 15:20:34 +02:00
Raphael Pierzina
1b6bc4d606
Add feature proposal to changelog
2016-06-25 14:58:18 +02:00
Bruno Oliveira
c519b9517a
Merge pull request #1663 from aostr/master
...
Rename the default plugin "pdb" into "debugging"
2016-06-25 09:56:54 -03:00
Florian Bruhin
ce603dc0ea
Add changelog entry for #1564
2016-06-25 14:18:41 +02:00
aostr
9a5224e2f8
Renamed the pdb module and changed unit tests accordingly
2016-06-25 12:37:31 +02:00
Danielle Jenkins
32ca5cdb09
Update changelog for new fixture hooks.
2016-06-25 12:33:31 +02:00
Omar Kohl
b3615ac29d
Update CHANGELOG with #607 and add version 3.0.0.dev1
2016-06-24 20:56:21 +02:00
Tom Viner
77689eb486
Fixes #1503 no longer collapse false explanations
2016-06-24 15:35:24 +02:00
Tom Viner
df9918eda3
issue1625, name getfuncargvalue to getfixturevalue
2016-06-24 10:08:19 +02:00
Stefan Zimmermann
69bab4ab04
added check for already existing option names to OptionGroup.addoption()
2016-06-22 18:01:35 +02:00
Steffen Allner
ecc97aa3b9
Use correct links in changelog.
2016-06-22 17:52:13 +02:00
Steffen Allner
dd97a2e7c8
Merge from upstream
2016-06-22 17:51:48 +02:00
Steffen Allner
0dbf77e08e
Add to changelog and authors.
2016-06-22 17:37:58 +02:00
Ronny Pfannschmidt
18ef7de96b
merge from master again
2016-06-22 16:03:52 +02:00
Ronny Pfannschmidt
083f64100d
merge master into features
2016-06-22 14:39:33 +02:00
Bruno Oliveira
fb79fa711b
Merge branch 'issue1553/diff-final-newline' of https://github.com/tomviner/pytest
2016-06-22 14:21:30 +02:00
Tom Viner
ec25d398a5
fix changelog links
2016-06-22 10:06:14 +02:00
Tom Viner
98adf204b2
issue 1553: Include terminal newlines in diffs
2016-06-22 09:50:15 +02:00
Bruno Oliveira
4350f499b2
Merge branch 'issue1629' of https://github.com/davehunt/pytest into features
2016-06-21 18:37:14 +02:00
Bruno Oliveira
573866bfad
Merge remote-tracking branch 'upstream/features' into issue-1619-conftest-assert-rewrite
2016-06-21 18:10:19 +02:00
Dave Hunt
393167b94f
Update CHANGELOG and add Oliver Bestwalter to AUTHORS
2016-06-21 16:59:14 +02:00
Omar Kohl
ede7478dcc
Exit pytest on collection error (without executing tests)
...
Add --continue-on-collection-errors option to restore the previous behaviour:
Execute tests (that were successfully collected) even when collection errors
happen.
Some tests had to be modified e.g. because the return code changed to 2
(EXIT_INTERRUPTED) instead of 1 (EXIT_TESTSFAILED) because an Interrupted
exception is raised on collection error.
Implemented via pair programming with:
Oleg Pidsadnyi <oleg.pidsadnyi@gmail.com>
closes #1421
2016-06-21 13:32:34 +02:00
Tom Viner
5854a71ece
Issue 460: getfuncargvalue fixture w. params err
2016-06-21 11:29:21 +02:00
Bruno Oliveira
e0cb046885
Update AUTHORS and CHANGELOG
2016-06-20 23:16:06 +02:00
Florian Bruhin
4f2db6c08d
Merge pull request #1616 from palaviv/pytest.raises-message
...
Pytest.raises custom error message
2016-06-20 18:43:12 +02:00
palaviv
c29130d400
Updated documentation
2016-06-19 23:34:42 +03:00
Bruno Oliveira
72bf11cbe9
Add disabled() method to capsys and capfd
...
Fix #1599
2016-06-19 19:14:36 +02:00
palaviv
e6ff01ada3
CR fixes
2016-06-16 21:09:15 +03:00
palaviv
8ddbca36c9
Add CHANGLOG entry
2016-06-16 20:21:03 +03:00
Bruno Oliveira
308396ae3c
Merge pull request #1606 from hackebrot/show-fixtures-per-test
...
Show fixtures per test
2016-06-14 09:54:18 -03:00
taschini
1218392413
Added taschini to AUTHORS and #1597 to CHANGELOG.rst.
2016-06-14 07:16:20 +02:00
Guyzmo
accd962c9f
Fixed issue shadowing error when missing argument on teardown_method
...
When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.
This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.
* fixes issue #1604
Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
2016-06-12 03:45:24 +02:00
Raphael Pierzina
bbc6c18448
Add changelog entry for new cli flag
2016-06-12 00:26:32 +01:00
Bruno Oliveira
371fbe4388
Update CHANGELOG (yield statements in normal fixtures)
2016-06-08 21:07:53 -03:00
marscher
09d163aa3a
[exception handling] Fix case the current working directory (CWD) gets deleted during testing.
...
Fixes #1235 .
2016-06-08 15:18:23 +02:00
Bruno Oliveira
dd9c81ca26
Mention #1580 in the CHANGELOG and add Thomas Grainger to AUTHORS
2016-06-01 19:56:45 -03:00
Thomas Grainger
2898dffb9e
Fix rst-lint CHANGELOG error
2016-06-01 17:43:41 +01:00
Ronny Pfannschmidt
b5bd4d959d
merge master to features
2016-06-01 08:13:26 +02:00
Ronny Pfannschmidt
f423f08b45
prepare cangelog for the next bugfix release
2016-06-01 08:04:21 +02:00
Ronny Pfannschmidt
a2a904466c
alter changelog header
2016-05-31 19:05:36 +02:00
Raphael Pierzina
945072b89a
Update changelog with --fixtures fix
2016-05-31 11:47:16 +01:00
Ronny Pfannschmidt
158f3cfaea
merge master
2016-05-31 11:24:53 +02:00
Ronny Pfannschmidt
ae4dff0e0a
add missing link to changelog
2016-05-30 14:34:38 +02:00
Ronny Pfannschmidt
d217b52508
fix #510 by adding a describing skip marker on empty parameterize
2016-05-30 14:34:38 +02:00
Bruno Oliveira
8c1be624a6
Merge pull request #1554 from RonnyPfannschmidt/merge-master
...
Merge master into features
2016-05-24 11:09:33 -03:00
Bruno Oliveira
5ab5a11544
Merge pull request #1565 from tomviner/issue1544/ignore-build-dist-dirs
...
Issue 1544: norecursedirs build & dist dirs
2016-05-23 19:30:20 -03:00
Ronny Pfannschmidt
26b526967e
merge from master again
2016-05-23 22:33:00 +02:00
TomV
d6dfb1a393
issue 1544: norecursedirs build & dist dirs
2016-05-23 21:02:29 +01:00
AbdealiJK
d4c9fa9f1a
unittest.UnitTestCase: Allow __test__ for methods
...
__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.
Fixes https://github.com/pytest-dev/pytest/issues/1558
2016-05-19 08:19:57 +05:30
Adam Chainz
8a39869347
Convert readthedocs link for their .org -> .io migration for hosted projects
...
As per their email ‘Changes to project subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified. One was not modified - `http://media.readthedocs.org/epub/pytest/latest/pytest.epub ` - since it doesn't work on `readthedocs.io`.
2016-05-18 17:12:39 +01:00
Ronny Pfannschmidt
eab762ea99
Merge branch 'master' into merge-master
2016-05-13 19:37:41 +02:00
Ronny Pfannschmidt
c49863aa63
merge next chunk from master and fix changelog linting issue
2016-05-13 19:36:47 +02:00
Ronny Pfannschmidt
01d2ff804b
Merge commit '56156bb119194014129ac08c4a2c370f0b893104' into merge-master
2016-05-13 17:55:02 +02:00
Ronny Pfannschmidt
68f658b6cc
Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master
2016-05-13 17:52:59 +02:00
Ronny Pfannschmidt
6cc56b4a1b
Merge pull request #1535 from palaviv/parametrize-test-ids-hook
...
introduce pytest_make_parametrize_id hook
2016-04-27 16:16:16 +02:00
Bruno Oliveira
fdee88f086
Merge pull request #1520 from omarkohl/invalid_test_module_name
...
Raise CollectError if import test module fails
2016-04-25 21:42:41 -03:00
palaviv
53429ed8b8
Added hook to plugin docs and new CHANGELOG record
2016-04-25 18:03:34 +03:00
Omar Kohl
56855893ca
Raise CollectError if import test module fails
...
One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.
fix #1426
2016-04-23 13:50:48 +02:00
MengJueM
f51c34ef31
Add changelog
2016-04-20 22:32:35 +08:00
Florian Bruhin
75160547f2
Use a callable __tracebackhide__ for filtering
...
While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible.
2016-04-20 11:09:27 +02:00
Florian Bruhin
b607f6728f
Filter selectively with __tracebackhide__
...
When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens.
2016-04-20 10:25:33 +02:00
TomV
99c4b6fdc3
issue 1496 - xfail with condition keyword
2016-04-19 18:12:37 +01:00
Martin Prusse
7ce5873da2
Perform a "unicode aware" check for maximum recursion depth error
...
Avoid errors `UnicodeErrosr`s due non maximum recursion depth errors
when checking for those errors.
2016-04-08 23:32:18 -03:00
Ronny Pfannschmidt
0f7aeafe7c
Merge pull request #1486 from roolebo/fix-issue-138
...
Fix issue #138 - support chained exceptions
2016-04-03 19:21:57 +02:00
Bruno Oliveira
e3bc6faa2b
Merge pull request #1470 from ceridwen/features
...
Escape both bytes and unicode strings for "ids" in Metafunc.parametrize
2016-04-03 13:48:30 -03:00
Omar Kohl
c578226d43
Implement ExceptionInfo.match() to match regexp on str(exception)
...
This implements similar functionality to
unittest.TestCase.assertRegexpMatches()
closes #372
2016-04-03 11:22:44 +02:00
Ceridwen
23a8e2b469
Add .hypothesis to .gitignore and try an older version of Hypothesis for 2.6
2016-04-02 11:47:37 -04:00
Ceridwen
08671fcf4a
Fix the changelog and dependencies for tox
2016-04-02 10:52:28 -04:00
palaviv
3ffce6ae4a
Added thanks and PR links in changlog
2016-03-23 18:53:50 +02:00
palaviv
412042d987
added entry to CHANGELOG
2016-03-23 00:21:24 +02:00
Ceridwen
1f46015de5
Merge remote-tracking branch 'upstream/features' into features
2016-03-22 16:22:00 -04:00
Quentin Pradet
1fbd19b8cb
Fix pytest.mark.skip mark when used in strict mode
2016-03-22 15:40:34 +04:00
Ceridwen
4405dd0ffe
Escape both bytes and unicode strings for "ids" in Metafunc.parametrize
2016-03-22 01:31:48 -04:00
Omar Kohl
725290a8ab
Add 'Minor doc fixes' to CHANGELOG
2016-03-20 20:39:31 +01:00
palaviv
dd384f7f78
Added changlog entries
2016-03-20 19:01:47 +02:00
Roman Bolshakov
52bc2f8616
Update authors & changelog
2016-03-20 01:06:53 +03:00
Bruno Oliveira
5fcce8a7d6
Merge branch 'master' into merge-master-into-features
2016-03-18 18:26:56 -03:00