Merge branch 'master' into all-contributors/add-davidjohnoliver

This commit is contained in:
Geoffrey Huntley 2019-06-28 17:41:08 +10:00 коммит произвёл GitHub
Родитель 585a76a84c 1a7bf36e17
Коммит 6b9d6808c2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 27 добавлений и 9 удалений

Просмотреть файл

@ -6,13 +6,21 @@
"commit": false,
"contributors": [
{
"login": "MartinZikmund",
"name": "Martin Zikmund",
"avatar_url": "https://avatars3.githubusercontent.com/u/1075116?v=4",
"profile": "http://mzikmund.com",
"login": "jeromelaban",
"name": "Jérôme Laban",
"avatar_url": "https://avatars0.githubusercontent.com/u/5839577?v=4",
"profile": "https://github.com/jeromelaban",
"contributions": [
"code",
"test"
"content",
"doc",
"example",
"maintenance",
"infra",
"ideas",
"review",
"test",
"projectManagement"
]
},
{
@ -23,8 +31,18 @@
"contributions": [
"blog"
]
},
{
"login": "MartinZikmund",
"name": "Martin Zikmund",
"avatar_url": "https://avatars3.githubusercontent.com/u/1075116?v=4",
"profile": "http://mzikmund.com",
"contributions": [
"code",
"test"
]
}
],
],
"contributorsPerLine": 7,
"projectName": "uno",
"projectOwner": "unoplatform",

Просмотреть файл

@ -50,9 +50,9 @@ For a larger example and features demo:
* [Microsoft XAML Behaviors](https://github.com/nventive/Uno.XamlBehaviors)
* [Prism](https://github.com/nventive/Uno.Prism)
* [MVVMCross](https://www.mvvmcross.com/) (soon)
* [ReactiveUI](https://github.com/nventive/Uno.ReactiveUI)
* [ReactiveUI Official](https://github.com/reactiveui/ReactiveUI/pull/2067)
* [WindowsStateTriggers](https://github.com/nventive/Uno.WindowsStateTriggers)
* [Xamarin.Forms for UWP](https://github.com/nventive/Uno.Xamarin.Forms)
* [Xamarin.Forms for UWP](https://github.com/nventive/Uno.Xamarin.Forms), [NuGet](https://www.nuget.org/packages/ReactiveUI.Uno)
* [Rx.NET](https://github.com/nventive/Uno.Rx.NET)
* [ColorCode-Universal](https://github.com/nventive/Uno.ColorCode-Universal)
* Any UWP project
@ -96,6 +96,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
<table><tr><td align="center"><a href="http://mzikmund.com"><img src="https://avatars3.githubusercontent.com/u/1075116?v=4" width="100px;" alt="Martin Zikmund"/><br /><sub><b>Martin Zikmund</b></sub></a><br /><a href="https://github.com/unoplatform/uno/commits?author=MartinZikmund" title="Code">💻</a> <a href="https://github.com/unoplatform/uno/commits?author=MartinZikmund" title="Tests">⚠️</a></td><td align="center"><a href="http://www.dissolutegames.com/"><img src="https://avatars0.githubusercontent.com/u/8270914?v=4" width="100px;" alt="David Oliver"/><br /><sub><b>David Oliver</b></sub></a><br /><a href="#blog-davidjohnoliver" title="Blogposts">📝</a></td></tr></table>
<table><tr><td align="center"><a href="https://github.com/jeromelaban"><img src="https://avatars0.githubusercontent.com/u/5839577?v=4" width="100px;" alt="Jérôme Laban"/><br /><sub><b>Jérôme Laban</b></sub></a><br /><a href="https://github.com/unoplatform/uno/commits?author=jeromelaban" title="Code">💻</a> <a href="#content-jeromelaban" title="Content">🖋</a> <a href="https://github.com/unoplatform/uno/commits?author=jeromelaban" title="Documentation">📖</a> <a href="#example-jeromelaban" title="Examples">💡</a> <a href="#maintenance-jeromelaban" title="Maintenance">🚧</a> <a href="#infra-jeromelaban" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-jeromelaban" title="Ideas, Planning, & Feedback">🤔</a> <a href="#review-jeromelaban" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/unoplatform/uno/commits?author=jeromelaban" title="Tests">⚠️</a> <a href="#projectManagement-jeromelaban" title="Project Management">📆</a></td><td align="center"><a href="http://www.dissolutegames.com/"><img src="https://avatars0.githubusercontent.com/u/8270914?v=4" width="100px;" alt="David Oliver"/><br /><sub><b>David Oliver</b></sub></a><br /><a href="#blog-davidjohnoliver" title="Blogposts">📝</a></td><td align="center"><a href="http://mzikmund.com"><img src="https://avatars3.githubusercontent.com/u/1075116?v=4" width="100px;" alt="Martin Zikmund"/><br /><sub><b>Martin Zikmund</b></sub></a><br /><a href="https://github.com/unoplatform/uno/commits?author=MartinZikmund" title="Code">💻</a> <a href="https://github.com/unoplatform/uno/commits?author=MartinZikmund" title="Tests">⚠️</a></td></tr></table>
<!-- ALL-CONTRIBUTORS-LIST:END -->