Merge branch 'master' of https://github.com/vman/sp-dev-fx-webparts into vman-master

# Conflicts:
#	samples/react-organisationchart/README.md
This commit is contained in:
Vesa Juvonen 2016-10-06 11:08:19 +03:00
commit 5473ca99d1
1 changed files with 4 additions and 2 deletions

View File

@ -14,7 +14,7 @@ A simple Organisation Chart webpart using Office UI Fabric, React, OData batchin
Solution|Author(s) Solution|Author(s)
--------|--------- --------|---------
OrganisationChart | Vardhaman Deshpande @vrdmn (Content and Code) OrganisationChart | Vardhaman Deshpande ([@vrdmn](https://twitter.com/vrdmn) , [vrdmn.com](http://vrdmn.com))
## Version history ## Version history
@ -46,4 +46,6 @@ This Web Part illustrates the following concepts on top of the SharePoint Framew
- React - React
- OData batching - OData batching
- ServiceScope and ServiceKeys - ServiceScope and ServiceKeys
- Service Locator pattern to register and consume services - Service Locator pattern to register and consume services
<img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-organisationchart" />