5 Commits

Author	SHA1	Message	Date
Wu Sheng	1a5cf2b536	Prepare for merging 6.0 into master	2018-08-30 13:50:30 +08:00
Wu Sheng	cd680393f3	Merge commit 'ee5c740be3970be2886d00222b9e3ecb4d1adefa' into 6.0 ... # Conflicts: # docs/powered-by.md	2018-08-30 13:49:05 +08:00
wqr2016	b9eafa08e9	Update powered-by.md (#1602)	2018-08-29 14:41:34 +08:00
Wu Sheng	38212dc97c	Remove duplicate words	2018-08-27 22:41:51 +08:00
Wu Sheng	06e62f0dd1	Update user to powered-by doc.	2018-08-27 22:18:06 +08:00