Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add explanation for config cache_dir. / Add locale zh-CN zh-TW. #363

Merged
merged 1 commit into from
May 28, 2015

Conversation

debbbbie
Copy link
Contributor

Add explanation for config.cache_dir. Add locale zh-CN zh-TW

@iNecas
Copy link
Member

iNecas commented May 28, 2015

Thanks @debbbbie Could you swash the commits before I merge it?

@debbbbie debbbbie changed the title Add explanation for config.cache_dir. add locale zh_CN zh_TW Add explanation for config.cache_dir / Add locale zh-CN zh-TW May 28, 2015
@debbbbie debbbbie changed the title Add explanation for config.cache_dir / Add locale zh-CN zh-TW Add explanation for config cache_dir. / Add locale zh-CN zh-TW. May 28, 2015
@debbbbie
Copy link
Contributor Author

@iNecas Do you mean commits title? How about now?

I feel excited about apipie, I't pretty!

@iNecas
Copy link
Member

iNecas commented May 28, 2015

I meant this (see #365) getting all commits together using git rebase -i, if you're ok with this, I would close this PR, merge #365 (the content as well as code attribution stayed preserved)

add locale zh_CN zh_TW

Update zh_CN.yml

Rename zh_CN.yml to zh-CN.yml

Update and rename zh_TW.yml to zh-TW.yml
@debbbbie
Copy link
Contributor Author

@iNecas done 😸

@debbbbie
Copy link
Contributor Author

your mean is squash

@iNecas
Copy link
Member

iNecas commented May 28, 2015

@debbbbie right, I haven't realized I have the typo in there, anyway, we understood each other at the end, so it's good, merging now, thanks!

iNecas added a commit that referenced this pull request May 28, 2015
Add explanation for config cache_dir. / Add locale zh-CN zh-TW.
@iNecas iNecas merged commit a47c055 into Apipie:master May 28, 2015
@debbbbie
Copy link
Contributor Author

✌️

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