8000 Merge 2.11 to 2.12 Aug 6 [ci: last-only] by SethTisue · Pull Request #7005 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

Merge 2.11 to 2.12 Aug 6 [ci: last-only] #7005

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Aug 8, 2018
Merged

Merge 2.11 to 2.12 Aug 6 [ci: last-only] #7005

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4318194
fix spelling, which has a parameter type
robstoll Mar 22, 2018
a97cefd
Backport #5640 to 2.11.x
mpetruska Nov 24, 2017
4842938
Merge pull request #6195 from mpetruska/SI-9881-fix-retrofit-2.11
adriaanm Jun 1, 2018
8c1282d
Merge pull request #6464 from robstoll/patch-1
adriaanm Jun 1, 2018
76cbf10
fix Windows-only test failure
SethTisue Jun 11, 2018
d209ff4
Merge pull request #6777 from SethTisue/windows-9881
SethTisue Jun 12, 2018
52c4ebc
Merge commit '48429388b3' into merge-2.11-to-2.12-aug-6
SethTisue Aug 7, 2018
34e9a4b
Merge commit 'd209ff4944' into merge-2.11-to-2.12-aug-6
SethTisue Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/03-types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ equivalent to `AnyRef` $\\{ R \\}$.

###### Example

The following example shows how to declare and use a method which
The following example shows how to declare and use a method which has
a parameter type that contains a refinement with structural declarations.

```scala
Expand Down
0