Merge pull request #304 from shazow/autocomplete-sort

author Andrey Petrov <shazow@gmail.com>

Sun, 17 Mar 2019 18:42:04 +0000 (14:42 -0400)

committer GitHub <noreply@github.com>

Sun, 17 Mar 2019 18:42:04 +0000 (14:42 -0400)
author Andrey Petrov <shazow@gmail.com>
Sun, 17 Mar 2019 18:42:04 +0000 (14:42 -0400)
committer GitHub <noreply@github.com>
Sun, 17 Mar 2019 18:42:04 +0000 (14:42 -0400)
diff --cc chat/message/user.go
Simple merge
diff --cc chat/room.go
Simple merge
author	Andrey Petrov <shazow@gmail.com>
	Sun, 17 Mar 2019 18:42:04 +0000 (14:42 -0400)
committer	GitHub <noreply@github.com>
	Sun, 17 Mar 2019 18:42:04 +0000 (14:42 -0400)
		1	2
chat/message/user.go	patch \|	diff1 \|	diff2 \|	blob \| history
chat/room.go	patch \|	diff1 \|	diff2 \|	blob \| history