Skip to content

同步更新#1

Merged
SSShooter merged 6 commits intoSSShooter:translate-/01-responsive-web-design/css-flexbox.jsonfrom
FreeCodeCampChina:translate
Jul 28, 2018
Merged

同步更新#1
SSShooter merged 6 commits intoSSShooter:translate-/01-responsive-web-design/css-flexbox.jsonfrom
FreeCodeCampChina:translate

Conversation

@SSShooter
Copy link
Copy Markdown
Owner

No description provided.

huluoyang and others added 6 commits July 24, 2018 10:30
* Translation of intermediate-algorithm-scripting, first half

* Address comments
* Add CONTRIBUTING.md, add guide of git

* address review comments

- Pick pull --rebase among three options
- Update guideline of resolving conflicts

* Add git FAQ. Remove labels def as for not needed

* Fix style issue, using HTML tags

* Update Details w/ GFM, fix wrong command

* Update FAQ with guide of resolving conflicts and clarification of git add . vs git add -A

* Update CONTRIBUTING.md

更新了下排版

* Update CONTRIBUTING.md

更改符号的使用

* Update CONTRIBUTING.md

continue fix some type error
Add a pattern that captures .vscode.*\.json, as provided by #7
* fix some typo error

* remove upcoming fileds

* resolve conflicts
@SSShooter SSShooter merged commit ad81dec into SSShooter:translate-/01-responsive-web-design/css-flexbox.json Jul 28, 2018
SSShooter pushed a commit that referenced this pull request Jul 30, 2018
* translation 2/10

* translation 4/10

* translate assert & revise

* translation 2/10

* revise

* fix typo

* translation 2/10

* fix typo

* revise

* translate the document

* fix typo

* translate the title

* remove upcoming
SSShooter pushed a commit that referenced this pull request Sep 7, 2018
* translation 2/10

* translation 4/10

* translate assert & revise

* translation 2/10

* revise

* fix typo

* translation 2/10

* fix typo

* revise

* translate the document

* fix typo

* translate the title

* remove upcoming
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.

3 participants