Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] 상세 피드 / 피드 좋아요, 삭제, 신고 구현 #140

Merged
merged 12 commits into from
Aug 22, 2023

Commits on Aug 21, 2023

  1. Configuration menu
    Copy the full SHA
    e3b229c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    61049c9 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'develop' into feature/feat-detail-createLike

    # Conflicts:
    #	app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt
    #	app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt
    #	app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt
    sxunea committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    82f5535 View commit details
    Browse the repository at this point in the history
  4. [merge] develop 충돌해결

    sxunea committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    4838ce3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1901950 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8bd141c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7271c10 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5f12bc7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bf1a2d6 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    465a502 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    603e5fc View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    a085c47 View commit details
    Browse the repository at this point in the history