Skip to content

Commit

Permalink
Merge branch 'develop' into feature-chat
Browse files Browse the repository at this point in the history
  • Loading branch information
Kimsoo0119 authored Feb 22, 2023
2 parents cb924cc + abbba7e commit d89c210
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,5 @@ jobs:
cd ~/summer
docker-compose down
docker rmi ghcr.io/klaus9267/summer-auto-deploy
docker rmi $(docker images -f "dangling=true" -q)
docker-compose pull
docker-compose up -d
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 4term-main-back
# 4term-main-back.

## 커밋 컨벤션

Expand Down
1 change: 1 addition & 0 deletions main-project/src/chats/chats.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { APiUploadFile } from './swagger/upload-file.decorator';
import { ApiCreateChatRoom } from './swagger/create-chat-room.decorator';
import { ApiRejecteInvitation } from './swagger/rejected-invitation.decorator';


@Controller('chats')
@ApiTags('채팅 APi')
export class ChatsController {
Expand Down

0 comments on commit d89c210

Please sign in to comment.