Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-23 00:10:32 +08:00
commit 9300c105fa

View File

@ -124,7 +124,7 @@ r.put('/channel/:chid/opay/setting', checkSession, getChannelList, hasChannel('c
let ed = new Date(ets)
let text = `insert into "public"."donate_setting" ("twitch", "start_date", "end_date", "target_amount", "title") values
($1, $2, $3, $4, $5) returning *
($1, $2, $3, $4, $5)
on CONFLICT ("twitch") DO UPDATE
set
"start_date" = $2,