diff options
| author | Filip785 <fdjuricic98@gmail.com> | 2020-07-08 17:21:44 +0200 |
|---|---|---|
| committer | Filip785 <fdjuricic98@gmail.com> | 2020-07-08 17:21:44 +0200 |
| commit | e7b7b0dee30356ef6912168949112896fe4dd65c (patch) | |
| tree | 3ab0abc410a4da218c08b45349824585afa8cb6c /server | |
| parent | 68e9755e593bbd8230eab2a123e822022721f071 (diff) | |
| parent | cd5f500d11d131213ccb89d3a8c9f5e31b3c758b (diff) | |
Merge remote-tracking branch 'upstream/master' into cake-day
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/lib.rs | 2 | ||||
| -rw-r--r-- | server/src/version.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/src/lib.rs b/server/src/lib.rs index 04f376fb..08c3fa98 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -325,7 +325,7 @@ pub fn markdown_to_html(text: &str) -> String { pub fn get_ip(conn_info: &ConnectionInfo) -> String { conn_info - .remote_addr() + .realip_remote_addr() .unwrap_or("127.0.0.1:12345") .split(':') .next() diff --git a/server/src/version.rs b/server/src/version.rs index cfac6294..cecd8dc6 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.12"; +pub const VERSION: &str = "v0.7.13"; |