skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							db00a08bdc
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:03:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							85cf7f26ce
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:03:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							acca147ff2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:56:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							d53da0e422
							
						
					 | 
					
						
						
							
							group add
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:56:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							11eaaab72d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:32:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							475e64fc5b
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:32:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bd8154ac4
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:15:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2fa0e7852
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:10:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2b324abc2
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:10:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2225dd841
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:05:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d26aa86b9
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:05:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e937d7d29
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:04:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe4b534b78
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 16:04:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0a65c7c68
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 15:58:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							416f87f4bb
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 15:50:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7eeb67be28
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 15:35:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ed6ee5075
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-29 15:35:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3c8215e15
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 13:31:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							30bc6c274e
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 13:30:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							ecb1068f0b
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 12:40:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6eef21b45
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 11:55:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							1aeff25316
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 11:48:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							6de569537f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-29 11:36:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							764bc3fead
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 11:35:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							a89d617532
							
						
					 | 
					
						
						
							
							group add
						
						
						
						
						
						
					 | 
					
						2022-03-29 11:27:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							fef33795d0
							
						
					 | 
					
						
						
							
							group add
						
						
						
						
						
						
					 | 
					
						2022-03-29 11:16:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2c04b761d
							
						
					 | 
					
						
						
							
							ali cloud oss
						
						
						
						
						
						
					 | 
					
						2022-03-29 11:01:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5828aba91
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun'
						
						
						
						
						
						
						
						# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go 
						
						
					 | 
					
						2022-03-29 10:58:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							1286f9dcb6
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-29 09:34:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							391e525fc5
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:27:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								skiffer-git
							
						 
					 | 
					
						
						
						
						
							
						
						
							afc32b1cfa
							
						
					 | 
					
						
						
							
							mute group
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:27:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0797181967
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:18:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							14c5e631ff
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:15:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cdb039c33
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:12:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a11c4fcb58
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 19:05:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c67a937d40
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:53:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							03fa7137b9
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:52:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e95400988e
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:51:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							942c9c6a63
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/tuoyun' into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:30:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c45665fde
							
						
					 | 
					
						
						
							
							add tag message conversation update
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:30:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d92ac8f588
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:13:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							169665da32
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:13:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4d80b4844
							
						
					 | 
					
						
						
							
							auto migrate test
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:52:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							7827749453
							
						
					 | 
					
						
						
							
							tag notification
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:37:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e78697a69
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:22:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0e6a78496
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:18:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							af99a93536
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:12:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9ea117985
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:10:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9ddb0140f
							
						
					 | 
					
						
						
							
							tag
						
						
						
						
						
						
					 | 
					
						2022-03-28 17:02:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangchuxiao
							
						 
					 | 
					
						
						
						
						
							
						
						
							dae70371d1
							
						
					 | 
					
						
						
							
							Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
						
						
						
						
						
						
					 | 
					
						2022-03-28 16:59:39 +08:00 | 
					
					
						
						
							
							
							
						
					 |