Skip to content

Commit

Permalink
Merge pull request #708 from woowacourse-teams/dev
Browse files Browse the repository at this point in the history
release: v1.4.1
  • Loading branch information
xrabcde authored Oct 27, 2021
2 parents 39490c6 + 6eb0e29 commit f5d2821
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@

import com.woowacourse.zzimkkong.domain.Member;
import com.woowacourse.zzimkkong.domain.OauthProvider;
import com.woowacourse.zzimkkong.dto.member.MemberFindResponse;
import com.woowacourse.zzimkkong.dto.member.MemberSaveRequest;
import com.woowacourse.zzimkkong.dto.member.MemberSaveResponse;
import com.woowacourse.zzimkkong.dto.member.MemberUpdateRequest;
import com.woowacourse.zzimkkong.dto.member.*;
import com.woowacourse.zzimkkong.dto.member.oauth.OauthMemberSaveRequest;
import com.woowacourse.zzimkkong.exception.member.DuplicateEmailException;
import com.woowacourse.zzimkkong.exception.member.NoSuchMemberException;
import com.woowacourse.zzimkkong.exception.member.ReservationExistsOnMemberException;
import com.woowacourse.zzimkkong.dto.member.LoginEmailDto;
import com.woowacourse.zzimkkong.repository.MemberRepository;
import com.woowacourse.zzimkkong.repository.ReservationRepository;
import org.springframework.security.crypto.password.PasswordEncoder;
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zzimkkong-frontend",
"version": "1.4.0",
"version": "1.4.1",
"main": "src/index.tsx",
"license": "MIT",
"homepage": "https://github.com/woowacourse-teams/2021-zzimkkong",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<included>
<appender name="KAFKA_APPENDER_DEV" class="com.github.danielwegener.logback.kafka.KafkaAppender">
<appender name="KAFKA_APPENDER_PROD" class="com.github.danielwegener.logback.kafka.KafkaAppender">
<encoder class="net.logstash.logback.encoder.LogstashEncoder"/>

<topic>logstash-s3proxy</topic>
Expand Down

0 comments on commit f5d2821

Please sign in to comment.