Skip to content

Commit c780cb1

Browse files
authored
Merge branch 'master' into translation
2 parents 297d12f + 42f555a commit c780cb1

File tree

6 files changed

+118
-166
lines changed

6 files changed

+118
-166
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ GEM
8585
html-pipeline (2.9.1)
8686
activesupport (>= 2)
8787
nokogiri (>= 1.4)
88-
html-proofer (3.9.2)
88+
html-proofer (3.9.3)
8989
activesupport (>= 4.2, < 6.0)
9090
addressable (~> 2.3)
9191
colorize (~> 0.8)

_articles/fr/legal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Tout ce que vous avez jamais osé demandé sur le côté juridique
55
class: legal
66
toc:
77
pourquoi-les-gens-se-soucient-tellement-du-c&ocirc;t&eacute;-l&eacute;gal-de-lopen-source: "Pourquoi les gens se soucient tellement du c&ocirc;t&eacute; l&eacute;gal de l'open source"
8-
les-projets-publics-GitHub-sont-ils-open-source: "Les projets publics GitHub sont-ils open source"
8+
les-projets-publics-github-sont-ils-open-source: "Les projets publics GitHub sont-ils open source"
99
donnez-moi-juste-lessentiel-sur-ce-dont-jai-besoin-pour-prot&eacute;ger-mon-projet: "Donnez-moi juste l'essentiel sur ce dont j'ai besoin pour prot&eacute;ger mon projet"
1010
quelle-licence-open-source-est-appropri&eacute;e-pour-mon-projet: "Quelle licence open source est appropri&eacute;e pour mon projet"
1111
et-si-je-veux-changer-la-licence-de-mon-projet: "Et si je veux changer la licence de mon projet"

_articles/zh-cn/getting-paid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ related:
2121

2222
<aside markdown="1" class="pquote">
2323
<img src="https://avatars.githubusercontent.com/gvanrossum?s=180" class="pquote-avatar" alt="avatar">
24-
我尝试着寻找让人爱不释手的编程项目,从而是我的周末或圣诞节也能保持状态。(...)我拥有一台家用电脑,手头也并不十分宽裕。在思考了一阵子之后,我决定写一新的交互式的编程语言,(...)后来我将这门语言叫做Python。
24+
我尝试着寻找让人爱不释手的编程项目,从而使我的周末或圣诞节也能保持状态。(...)我拥有一台家用电脑,手头也并不十分宽裕。在思考了一阵子之后,我决定写一新的交互式的编程语言,(...)后来我将这门语言叫做Python。
2525
<p markdown="1" class="pquote-credit">
2626
@gvanrossum, ["Python 编程"](https://www.python.org/doc/essays/foreword/)
2727
</p>

package-lock.json

Lines changed: 112 additions & 161 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"postinstall": "cd test && npm install"
77
},
88
"dependencies": {
9-
"primer-core": "6.10.4",
10-
"primer-marketing": "6.3.0"
9+
"primer-core": "6.10.6",
10+
"primer-marketing": "6.3.1"
1111
}
1212
}

0 commit comments

Comments
 (0)