Software /
code /
prosody
Changeset
11068:988ddd57e851
Merge 0.11->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 15 Sep 2020 09:09:06 +0100 |
parents | 11066:dc41c8dfd2b1 (current diff) 11067:f2ffc16a9669 (diff) |
children | 11069:770a5923e959 |
files | net/http.lua net/server_epoll.lua net/server_event.lua net/server_select.lua |
diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Sep 11 12:37:07 2020 +0100 +++ b/.hgtags Tue Sep 15 09:09:06 2020 +0100 @@ -72,3 +72,4 @@ dd7e924c74ef27b7f92eb872d2db50aaa229b234 0.11.3 10d6d0d91f4ec47a6eb446792fee1d4b79a914d7 0.11.4 dbd60f47316492bc367802914dc8fa47f4b3edac 0.11.5 +bacca65ce107b8549ce5f9079e81e5771eed2021 0.11.6