Commit Graph

173 Commits (b40d31704917c4bf8b52c4368f1c473bee106880)

Author SHA1 Message Date
KiriKira 72f5017930
Merge pull request #4 from q158073378252010/2017.12.12
Add comments and configuration
2017-12-13 16:34:55 +08:00
q158073378252010 288c6e6759
Update Nginx.config 2017-12-13 02:03:36 +08:00
q158073378252010 0daec119b3
Add comments and configuration 2017-12-13 01:50:41 +08:00
q158073378252010 080cc162e0
Merge pull request #2 from KiriKira/master
sync
2017-12-12 23:44:07 +08:00
kirikira 3519e6b4ed rename Nginx folder 2017-12-12 16:41:19 +08:00
kirikira e5f97678e2 add Caddy (using header) 2017-12-09 19:03:50 +08:00
KiriKira 8b41973bf2
Merge pull request #3 from q158073378252010/2017.12.09
add websocket-Nginx-TLS
2017-12-09 16:36:42 +08:00
q158073378252010 2a3cdb20b3
Create config_server.json 2017-12-09 13:52:27 +08:00
q158073378252010 2a01911fbf
Create config_client.json 2017-12-09 13:51:47 +08:00
q158073378252010 d71cd955e9
Create Nginx.config 2017-12-09 13:50:18 +08:00
q158073378252010 7271479c34
Merge pull request #1 from KiriKira/master
back
2017-12-09 13:28:20 +08:00
kirikira 64e9d06a87 修正 wss 模板 2017-12-04 22:42:23 +08:00
kirikira bddebc53b6 add ss with mkcp 2017-11-29 23:10:17 +08:00
kirikira 08c68890fa add ss with mkcp 2017-11-29 23:08:05 +08:00
KiriKira 87ea62f7d0
Merge pull request #1 from Ariselia/master
beautified
2017-11-28 23:23:30 +08:00
root 647dea28ad beautified 2017-11-28 23:11:54 +08:00
Unknown 632dc9ca04 Merge remote-tracking branch 'origin/master' 2017-11-26 10:16:06 +08:00
Unknown c23c9b0976 fix mkcp with wechat_vedio 2017-11-26 10:14:40 +08:00
Unknown e3124c0d6b Merge remote-tracking branch 'origin/master' 2017-11-25 22:24:37 +08:00
kirikira af746f9074 edit README 2017-11-25 21:54:32 +08:00
kirikira aa3eca0843 start 2017-11-25 19:43:00 +08:00
kirikira 03b825183a start 2017-11-25 19:24:52 +08:00
KiriKira d410fdbb76
Initial commit 2017-11-25 18:26:29 +08:00