Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.5.0] [tx] updated from transifex #37708

Merged
merged 2 commits into from
Jul 20, 2020

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Jul 20, 2020

  1. Backport Transifex translation changes that were applied to master on Sunday morning.
    There were no transifex changes this morning (Monday).

If we are going to make the next RC soon, then we may as well have the latest translations.

  1. Backport PR [Tests-Only] Fix phpstan.neon after phpstan 0.12.33 release #37709 "Fix phpstan.neon after phpstan 0.12.33 release" to make CI pass in release-10.5.0

@phil-davis phil-davis requested a review from micbar July 20, 2020 08:17
@phil-davis phil-davis self-assigned this Jul 20, 2020
@owncloud owncloud deleted a comment from update-docs bot Jul 20, 2020
@phil-davis phil-davis requested a review from individual-it July 20, 2020 09:22
@phil-davis
Copy link
Contributor Author

https://drone.owncloud.com/owncloud/core/25996/118/9
stupid yarn install error - starting CI again.

@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 20, 2020

Note: the 2nd commit here does not effect released code, it just gets the phpstan settings so that it passes.

And the 1st commit is translations only.

So no effect on the run-time code.

@phil-davis phil-davis merged commit 313e763 into release-10.5.0 Jul 20, 2020
@delete-merged-branch delete-merged-branch bot deleted the transifex-10.5.0-20200720 branch July 20, 2020 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants