Merge remote-tracking branch 'origin/master'

This commit is contained in:
Peng-YM 2020-08-31 02:15:43 +08:00
commit bd6d0849e4

View File

@ -4,4 +4,8 @@
hostname=sub.store hostname=sub.store
[Script] [Script]
<<<<<<< HEAD
Sub-Store = type=http-request,pattern=^https?:\/\/sub\.store,script-path=sub-store.js,requires-body=true,timeout=120 Sub-Store = type=http-request,pattern=^https?:\/\/sub\.store,script-path=sub-store.js,requires-body=true,timeout=120
=======
Sub-Store = type=http-request,pattern=^https?:\/\/sub\.com,script-path=sub-store.js,requires-body=true,timeout=120
>>>>>>> master