Resolve conflicts
Showing
- .config/example.yml 0 additions, 3 deletions.config/example.yml
- .gitignore 2 additions, 1 deletion.gitignore
- CHANGELOG.md 0 additions, 532 deletionsCHANGELOG.md
- LICENSE 661 additions, 21 deletionsLICENSE
- LICENSE_AGPL-3.0 0 additions, 661 deletionsLICENSE_AGPL-3.0
- README.md 24 additions, 29 deletionsREADME.md
- docker/Dockerfile 1 addition, 1 deletiondocker/Dockerfile
- docs/setup.en.md 3 additions, 3 deletionsdocs/setup.en.md
- docs/setup.ja.md 3 additions, 3 deletionsdocs/setup.ja.md
- gulpfile.ts 0 additions, 1 deletiongulpfile.ts
- locales/ja.yml 1 addition, 1 deletionlocales/ja.yml
- src/index.ts 0 additions, 1 deletionsrc/index.ts
- src/server/api/authenticate.ts 2 additions, 2 deletionssrc/server/api/authenticate.ts
- src/server/api/bot/core.ts 4 additions, 4 deletionssrc/server/api/bot/core.ts
- src/server/api/bot/interfaces/line.ts 6 additions, 6 deletionssrc/server/api/bot/interfaces/line.ts
- src/server/api/common/drive/add-file.ts 8 additions, 8 deletionssrc/server/api/common/drive/add-file.ts
- src/server/api/common/get-friends.ts 4 additions, 4 deletionssrc/server/api/common/get-friends.ts
- src/server/api/common/notify.ts 9 additions, 9 deletionssrc/server/api/common/notify.ts
- src/server/api/common/push-sw.ts 2 additions, 2 deletionssrc/server/api/common/push-sw.ts
- src/server/api/common/read-messaging-message.ts 6 additions, 6 deletionssrc/server/api/common/read-messaging-message.ts
Loading
Please register or sign in to comment