whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master to 1.10, with fixes (#7682)

Browse Source
This commit is contained in:
Jennifer Rondeau
2018-03-08 14:03:55 -05:00
committed by zacharysarah
parent 7f40782850
commit 3d79703d23
60 changed files with 26896 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_data/docs-home.yml
+5
View File
@@ -18,8 +18,13 @@ toc:
- docs/home/contribute/review-issues.md
- docs/home/contribute/style-guide.md
- docs/home/contribute/includes.md
<<<<<<< HEAD
- docs/home/contribute/localization.md
- docs/home/contribute/blog-post.md
||||||| merged common ancestors
=======
- docs/home/contribute/localization.md
>>>>>>> merge master to 1.10, with fixes (#7682)
- title: Updating Automatically Generated Reference Pages
section: