[PR #325] [MERGED] merge dev to master #4174

New issue

Closed

opened 2026-05-05 14:37:05 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:37:05 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/325
Author: @fatedier
Created: 5/20/2017
Status: ✅ Merged
Merged: 5/20/2017
Merged by: @fatedier

Base: master ← Head: dev

📝 Commits (2)

ba6afd5 doc: update
faf584e metric: fix statistics error

📊 Changes

4 files changed (+10 additions, -4 deletions)

View changed files

📝 README.md (+1 -1)
📝 README_zh.md (+1 -1)
📝 server/metric.go (+7 -2)
📝 server/service.go (+1 -0)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fatedier/frp/pull/325 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 5/20/2017 **Status:** ✅ Merged **Merged:** 5/20/2017 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `master` ← **Head:** `dev` --- ### 📝 Commits (2) - [`ba6afd5`](https://github.com/fatedier/frp/commit/ba6afd5789d129587e6416c13e4c5ee1374568f9) doc: update - [`faf584e`](https://github.com/fatedier/frp/commit/faf584e1dd7b0013bc81e0393f80b36be1bb2502) metric: fix statistics error ### 📊 Changes **4 files changed** (+10 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+1 -1) 📝 `README_zh.md` (+1 -1) 📝 `server/metric.go` (+7 -2) 📝 `server/service.go` (+1 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>