Skip to content

Update training.rst#3485

Merged
amyblais merged 1 commit intomasterfrom
justinegeffen-patch-3
Mar 30, 2020
Merged

Update training.rst#3485
amyblais merged 1 commit intomasterfrom
justinegeffen-patch-3

Conversation

@justinegeffen
Copy link
Copy Markdown
Contributor

Removed vice-chair from COM meeting list, and fixed link to "Framework for Improving Critical Infrastructure Cybersecurity" as it was outdated.

Removed vice-chair from COM meeting list, and fixed link to "Framework for Improving Critical Infrastructure Cybersecurity" as it was outdated.
@justinegeffen justinegeffen added the 2: Editor Review Requires review by an editor label Mar 30, 2020
@amyblais amyblais removed their assignment Mar 30, 2020
@amyblais amyblais self-requested a review March 30, 2020 18:25
@amyblais amyblais removed the 2: Editor Review Requires review by an editor label Mar 30, 2020
@amyblais amyblais merged commit 9f02752 into master Mar 30, 2020
@amyblais amyblais deleted the justinegeffen-patch-3 branch March 30, 2020 19:08
justinegeffen pushed a commit that referenced this pull request Apr 6, 2020
* master:
  Added Let's Encrypt clarification  (#2866)
  Update security.rst (#3434)
  Update sg_grammar-spelling-mechanics.rst (#3462)
  Update training.rst (#3485)
  Update release-faq.rst (#3484)
  Documenting how to change the default docker-compose network (#3480)
  Fixes GH-542-Moved : Request for Documentation: Add to interactive-messages documentation (#3482)
  Correct Code Block Formatting (#3477)
  Update mmctl-cli-tool.rst (#3481)
  FAQ on Archived Channels and data retention (#3470)
  Update desktop-changelog.rst (#3473)
  Update desktop-changelog.rst (#3471)
  Added Video to AD/LDAP Group Sync (#3450)
  Hint to `"skip_slack_parsing"` to ignore Slack-compatibility logic (#3427)
  Update bug-severity-guidelines.rst (#3467)
  Moving Push Proxy related entry to developer documentation (#3448)
justinegeffen pushed a commit that referenced this pull request Apr 8, 2020
…/docs into justinegeffen-patch-7

* 'justinegeffen-patch-7' of https://github.com/mattermost/docs: (90 commits)
  Update integrations.rst
  Remove Oracle from Bitnami packages (#3491)
  Revert "Adding NPS rating for docs pages (#3469)" (#3495)
  Add Plugin Labels and Prepackaged Plugin Info (#3395)
  Adding NPS rating for docs pages (#3469)
  Fix broken link in Bot Account Creation > Plugin (#3493)
  Added Let's Encrypt clarification  (#2866)
  Update security.rst (#3434)
  Update sg_grammar-spelling-mechanics.rst (#3462)
  Update training.rst (#3485)
  Update release-faq.rst (#3484)
  Documenting how to change the default docker-compose network (#3480)
  Fixes GH-542-Moved : Request for Documentation: Add to interactive-messages documentation (#3482)
  Correct Code Block Formatting (#3477)
  Update mmctl-cli-tool.rst (#3481)
  FAQ on Archived Channels and data retention (#3470)
  Update desktop-changelog.rst (#3473)
  Update desktop-changelog.rst (#3471)
  Added Video to AD/LDAP Group Sync (#3450)
  Hint to `"skip_slack_parsing"` to ignore Slack-compatibility logic (#3427)
  ...

# Conflicts:
#	source/install/troubleshooting.rst
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants