4 Commits

Author SHA1 Message Date
0cc4d9aacb Merge branch 'master' of github.com:funson86/yii2 into funson
Conflicts:
	docs/guide-zh-CN/structure-application-components.md
	docs/guide-zh-CN/structure-applications.md
	docs/guide-zh-CN/structure-entry-scripts.md
	docs/guide-zh-CN/structure-overview.md
2014-10-02 18:50:08 +08:00
631dfd7c8a proofread structure-entry-scripts.md Chinese. 2014-09-29 20:36:55 +08:00
ca950c2117 new translation 2014-09-29 20:36:52 +08:00
e6cff24ad1 new translation 2014-09-28 09:14:05 +08:00