merge master · ec03c6b48c - talk - Gitea: Git with a cup of tea

wassname/talk

mirror of https://github.com/wassname/talk.git synced 2026-07-20 12:40:47 +08:00

merge master

This commit is contained in:

riley

2017-05-22 13:10:43 -06:00

parent 8f219c47a7 f32208b35b

commit ec03c6b48c

105 changed files with 2436 additions and 435 deletions

									
										models/enum/user_roles.js
									
		+2
		-1
	
												View File
												
				@@ -1,4 +1,5 @@

				module.exports = [

				  'ADMIN',

				  'MODERATOR'

				  'MODERATOR',

				  'STAFF'

				];