Resolve syncing conflicts from live-sync-work to live#95

Merged

RobStand merged 42 commits intolivefrom

Dec 18, 2017

Commits on Dec 1, 2017

Commits on Dec 2, 2017

Bot state data update (#387)

v-ducvo
authored and
RobStand
committed
Dotnet core (#390)

v-ducvo
authored and
RobStand
committed

Commits on Dec 4, 2017

Merge branch 'live' into master
RobStand
authored

Commits on Dec 7, 2017

Community content (#398)
RobStand
authored

Commits on Dec 13, 2017

Commits on Dec 14, 2017

Update images for bot scenarios. (#410)

v-royhar
authored and
Kamran Iqbal
committed
Changing to relative URLs
RobStand
committed
Fixing relative links
RobStand
committed
Merge branch 'live'
RobStand
committed

Commits on Dec 18, 2017

Minor updates
RobStand
committed
Adding back the cognitive services article (#413)
RobStand
authored
CI job update 2017-12-15 22:56 (#412)

glibnub
authored and
RobStand
committed
Merge branch 'live' into master
RobStand
authored
Fixing link to channel inspector
RobStand
committed
Release 12-18-2017 (#414)
RobStand
authored
Create .ops.mref.csv
Den Delimarsky
authored
Create .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Update .ops.mref.yaml
Den Delimarsky
authored
Added related docs
RobStand
committed
Merge branch 'master' into live
RobStand
authored
Merge branch 'live' into live-sync-work
RobStand
authored