Merge remote-tracking branch 'gitea/feature' into feature

# Conflicts:
#	resources/views/function/edit-friend.blade.php

resources/views/function/edit-friend.blade.php

@@ -213,8 +213,8 @@ class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:
                                 @else
                                     @foreach($blogColor as $blogValue)
                                         <option value="{{ $blogValue->id }}"
-                                                @if($blogValue->id == $blog->blogSetColor)selected @endif @if($blogValue->onlyAdminUse)disabled @endif>{!!
+                                                @if($blogValue->id == $blog->blogSetColor)selected @endif @if($blogValue->onlyAdminUse)disabled @endif>
-                                                $blogValue->comment !!}</option>
+                                            {!! $blogValue->comment !!}</option>
                                     @endforeach
                                 @endif
                             </select>