mirror of
https://github.com/acmesh-official/acme.sh.git
synced 2025-05-05 23:24:54 +00:00
Merge branch 'master' of https://github.com/bittorf/acme.sh
Conflicts: dnsapi/dns_dp.sh
This commit is contained in:
commit
c53500a4e6
@ -199,7 +199,11 @@ _get_root() {
|
|||||||
|
|
||||||
#Usage: method URI data
|
#Usage: method URI data
|
||||||
_rest() {
|
_rest() {
|
||||||
|
<<<<<<< HEAD
|
||||||
m="$1" # method e.g. GET|POST|PUT|DELETE
|
m="$1" # method e.g. GET|POST|PUT|DELETE
|
||||||
|
=======
|
||||||
|
export m=$1 # e.g. GET|POST
|
||||||
|
>>>>>>> db75015a49bba555cd1f46de00a9fbf9a07aa562
|
||||||
ep="$2"
|
ep="$2"
|
||||||
data="$3"
|
data="$3"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user