Commit Graph

12765 Commits

Author SHA1 Message Date
any
3b4626b6b2 merge remote 2021-02-01 12:46:51 +08:00
shylocks
e75c3c9acf merge remote 2021-02-01 12:46:51 +08:00
anonymous
2c242b677f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
anonymous
a37a16e939 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
any
937e41fa0d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
any
63fd320cca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
shylocks
cdd46c57bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
lxk0301
f0d079c508 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
858b420393 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
f7011245ad 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
a0636a7c58 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
6b70c6de55 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
2490b09388 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
anonymous
ea350b0460 小号送卡领卡 2021-02-01 12:43:58 +08:00
anonymous
dae4bda3d1 小号送卡领卡 2021-02-01 12:43:58 +08:00
any
57d27fc8e7 小号送卡领卡 2021-02-01 12:43:58 +08:00
any
90baffac40 小号送卡领卡 2021-02-01 12:43:58 +08:00
shylocks
b64a670eef 小号送卡领卡 2021-02-01 12:43:58 +08:00
lxk0301
a915298d8b 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
51d6525e2a 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
9b7a0062aa 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
ce0c9ec6b0 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
4cccbc9b39 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
5ffbddcda5 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
any
1b4c7ece8d Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
anonymous
ff1e7bdfae Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
anonymous
4ed7575a8f Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
any
55e5497b1e Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
Evine
0456d1b188 Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
Evine
269f8c506e Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
lxk0301
cc491c80ab fix 2021-02-01 10:54:26 +08:00
lxk0301
734194c612 fix 2021-02-01 10:54:26 +08:00
lxk0301
f12e839c92 fix 2021-02-01 10:54:26 +08:00
lxk0301
f04328c1e7 fix 2021-02-01 10:54:26 +08:00
lxk0301
758052c59e fix 2021-02-01 10:54:26 +08:00
lxk0301
75513781bb fix 2021-02-01 10:54:26 +08:00
lxk0301
c07d99c77b 优化 2021-02-01 10:43:34 +08:00
lxk0301
fab2600aca 优化 2021-02-01 10:43:34 +08:00
lxk0301
aeca907bdd 优化 2021-02-01 10:43:34 +08:00
lxk0301
5e6e24b176 优化 2021-02-01 10:43:34 +08:00
lxk0301
aebac05824 优化 2021-02-01 10:43:34 +08:00
lxk0301
9066b97d7d 优化 2021-02-01 10:43:34 +08:00
lxk0301
4e1e73eeb7 fix 2021-02-01 09:58:04 +08:00
lxk0301
a54cb43d1c fix 2021-02-01 09:58:04 +08:00
lxk0301
57354d5f15 fix 2021-02-01 09:58:04 +08:00
lxk0301
bb6ddca934 fix 2021-02-01 09:58:04 +08:00
lxk0301
fe2405623a fix 2021-02-01 09:58:04 +08:00
lxk0301
a221b4e3ad fix 2021-02-01 09:58:04 +08:00
lxk0301
adfa862b06 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00
lxk0301
a1a465be55 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00