Merge branch 'release-2020.03.30' into develop

AndreMiras · AndreMiras · commit 6ea0750cbfc2 · 2020-04-05T10:02:51.000+02:00
```
git mergetool

This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff
Merging:
.travis.yml
pythonforandroid/python.py
testapps/setup_testapp_python3.py

Normal merge conflict for '.travis.yml':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (vimdiff):
4 files to edit

Deleted merge conflict for 'pythonforandroid/python.py':
  {local}: deleted
  {remote}: modified file
Use (m)odified or (d)eleted file, or (a)bort? d

Deleted merge conflict for 'testapps/setup_testapp_python3.py':
  {local}: deleted
  {remote}: modified file
Use (m)odified or (d)eleted file, or (a)bort? d
```
diff --git a/pythonforandroid/__init__.py b/pythonforandroid/__init__.py
@@ -1 +1 @@
-__version__ = '2019.10.06.post0'
+__version__ = '2020.03.30'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '2019.10.06.post0'`
	`1`	`+__version__ = '2020.03.30'`