Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dennisdoomen committed May 21, 2022
2 parents d77966d + 2407c3c commit e090a23
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,12 @@ This is a special set of tests that use the [Verify](https://github.com/VerifyTe
If you've verified the changes and decided they are valid, you can accept them using `AcceptApiChanges.ps1` or `AcceptApiChanges.sh`. Alternatively, you can use the [Verify Support](https://plugins.jetbrains.com/plugin/17240-verify-support) plug-in to compare the changes and accept them right from inside Rider. See also the [Contribution Guidelines](CONTRIBUTING.md).

# Powered By
<a href="https://www.jetbrains.com/rider/"><img src="docs/assets/images/jetbrainsrider.svg" style="width:150px"/></a> <br/>and <br>
<a href="https://www.semanticmerge.com/"><img src="docs/assets/images/semantic-merge.png" style="width:150px"/></a>
<a href="https://aws.amazon.com/"><img src="docs/assets/images/aws.png" style="width:100px"/></a>&nbsp;
<a href="https://www.jetbrains.com/rider/"><img src="docs/assets/images/jetbrainsrider.svg" style="width:150px"/></a>&nbsp;<a href="https://www.semanticmerge.com/"><img src="docs/assets/images/semantic-merge.png" style="width:150px"/></a>

With support from the following public [sponsors](https://github.com/sponsors/fluentassertions)
<a href="https://github.com/waywedo"><img src="https://avatars.githubusercontent.com/u/20328638?s=52&v=4"/></a>
<a href="https://github.com/JD-Innovensa"><img src="https://avatars.githubusercontent.com/u/70314004?s=52&v=4"/></a>
<a href="https://github.com/rena0157"><img src="https://avatars.githubusercontent.com/u/33334607?s=52&v=4"/></a>
<a href="https://github.com/hassanhabib"><img src="https://avatars.githubusercontent.com/u/1453985?s=52&v=4"/></a>

6 changes: 6 additions & 0 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ GEM
http_parser.rb (~> 0)
ethon (0.15.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
execjs (2.8.1)
faraday (1.9.3)
Expand All @@ -49,6 +50,7 @@ GEM
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
ffi (1.15.5-x64-mingw-ucrt)
ffi (1.15.5-x64-mingw32)
forwardable-extended (2.6.0)
gemoji (3.0.1)
Expand Down Expand Up @@ -232,6 +234,8 @@ GEM
jekyll-seo-tag (~> 2.1)
minitest (5.15.0)
multipart-post (2.1.1)
nokogiri (1.13.1-x64-mingw-ucrt)
racc (~> 1.4)
nokogiri (1.13.1-x64-mingw32)
racc (~> 1.4)
octokit (4.22.0)
Expand Down Expand Up @@ -270,12 +274,14 @@ GEM
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unf_ext (0.0.8-x64-mingw32)
unicode-display_width (1.8.0)
webrick (1.7.0)
zeitwerk (2.5.4)

PLATFORMS
x64-mingw-ucrt
x64-mingw32

DEPENDENCIES
Expand Down
Binary file added docs/assets/images/aws.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
overlay_color: "#373737"
overlay_filter: "0.7"
overlay_image: "/assets/images/fluent_assertions_large_horizontal.svg"
cta_label: "Another month, another release."
cta_label: "Another month, another release...6.7 is here"
cta_url: "https://fluentassertions.com/releases/#670"
caption: "Logo by [**IUserName**](https://github.com/IUsername) and icons by [**Zlatko Najdenovski**](https://www.flaticon.com/authors/zlatko-najdenovski) from [Flaticon](https://www.flaticon.com/)
"
Expand Down Expand Up @@ -78,6 +78,7 @@
image_path: /assets/images/gift.svg
excerpt: '
This project is [supported](https://github.com/sponsors/fluentassertions) by [Albert Weinert](https://github.com/DerAlbertCom) and [Way We Do](https://github.com/waywedo) with special thanks to our super-sponsors
<a href="https://aws.amazon.com/"><img src="/assets/images/aws.png" style="width:80px"/></a>,
<a href="https://www.jetbrains.com/rider/"><img src="/assets/images/jetbrainsrider.svg" style="width:150px"/></a> and
<a href="https://www.semanticmerge.com/"><img src="/assets/images/semantic-merge.png" style="width:150px"/></a>
'
Expand Down

0 comments on commit e090a23

Please sign in to comment.