GitBucket
|
Merge branch 'master' of github.com:thinkingfioa/xxl-job
# Conflicts: # xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties # xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties |
|---|
|
|
| xxl-job-admin/src/main/resources/xxl-job-admin.properties |
|---|
| xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties |
|---|
| xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties |
|---|