Fix merge conflicts on master · bf1fbfe03f - talk - Gitea: Git with a cup of tea

wassname/talk

mirror of https://github.com/wassname/talk.git synced 2026-08-09 12:30:42 +08:00

Fix merge conflicts on master

This commit is contained in:

Kim Gardner

2018-01-04 16:43:51 -05:00

parent e2534e7ca8

commit bf1fbfe03f

21 changed files with 554 additions and 4 deletions

									
										plugins/talk-plugin-subscriber/client/translations.yml
									
		+3
		
												View File
												
				@@ -7,3 +7,6 @@ es:

				zh_CN:

				  talk-plugin-subscriber:

				    subscriber: "订阅用户"

				zh_TW:

				  talk-plugin-subscriber:

				    subscriber: "訂閱者"