Commits · cfe0f96b1cdced357eaa0feeea6f70fd4a11b347 · students / bora-it

05 Aug, 2021 5 commits
- Merge remote-tracking branch 'origin/woojiweon2' into seoyeon3 · cfe0f96b
  seoyeon authored Aug 05, 2021
  
  cfe0f96b
- e · b9acab65
  우지원 authored Aug 05, 2021
  
  b9acab65
- Merge remote-tracking branch 'origin/jaeyeon' into woojiweon2 · 33179169
  우지원 authored Aug 05, 2021
  
  33179169
- 0805 · a3590849
  우지원 authored Aug 05, 2021
  
  a3590849
- aaa · 13fb60af
  이재연 authored Aug 05, 2021
  
  13fb60af
04 Aug, 2021 20 commits
- 채널참여(DB에저장)가능 - 다른채널에 참가 or 방에서 나갈시 채널퇴장 추가해야됨.... · 57c9ec85
  우지원 authored Aug 05, 2021
  
  57c9ec85
- Merge remote-tracking branch 'origin/jaeyeon' into woojiweon2 · 17fb0773
  우지원 authored Aug 04, 2021
  
  17fb0773
- 0 · 7d87eeae
  우지원 authored Aug 04, 2021
  
  7d87eeae
- e · 973b3384
  우지원 authored Aug 04, 2021
  
  973b3384
- Merge remote-tracking branch 'origin/jaeyeon' into seoyeon3 · 6aeb3ac5
  seoyeon authored Aug 04, 2021
  
  6aeb3ac5
- 0804 · 65c7735b
  seoyeon authored Aug 04, 2021
  
  65c7735b
- 진짜 머지 끝 · d7cf7826
  이재연 authored Aug 04, 2021
  
  d7cf7826
- Merge remote-tracking branch 'origin/jaeyeon' into seoyeon3 · 3a6135b9
  seoyeon authored Aug 04, 2021
  
  3a6135b9
- 오류난다 · c87ccbd3
  seoyeon authored Aug 04, 2021
  
  c87ccbd3
- aaaa · 84e6503b
  이재연 authored Aug 04, 2021
  
  84e6503b
- Merge remote-tracking branch 'origin/jaeyeon' into woojiweon2 · d36cfae8
  우지원 authored Aug 04, 2021
  
  d36cfae8
- 에러 난다... · 58332a88
  seoyeon authored Aug 04, 2021
  
  58332a88
- 거의다아다다ㅏ다다닫다다다다닫다 · e74098fc
  이재연 authored Aug 04, 2021
  
  e74098fc
- Merge remote-tracking branch 'origin/seoyeon3' into jaeyeon · bbc945b7
  이재연 authored Aug 04, 2021
  
  bbc945b7
- 사진 위치 이동 · 951e6ee8
  seoyeon authored Aug 04, 2021
  
  951e6ee8
- ㄷ · 93d06f1e
  우지원 authored Aug 04, 2021
  
  93d06f1e
- 퇴장완료!예예~~~ · c5ab0718
  우지원 authored Aug 04, 2021
  
  c5ab0718
- 수저어어엉어어어어ㅓㅇ~~~~~~~~~~~~~~ · 8ec958be
  이재연 authored Aug 04, 2021
  
  8ec958be
- 0804 · bdb9b490
  seoyeon authored Aug 04, 2021
  
  bdb9b490
- merge-all · d8d3d203
  Kim, Chaerin authored Aug 04, 2021
  
  d8d3d203
01 Aug, 2021 2 commits
- img 폴더로 관리 · 3e9c534c
  Kim, Chaerin authored Aug 01, 2021
  
  3e9c534c
- merge19 · 303f5519
  Kim, Chaerin authored Aug 01, 2021
  
  303f5519
28 Jul, 2021 5 commits
- 불필요 삭제 · 4361c312
  Kim, Chaerin authored Jul 28, 2021
  
  4361c312
- socket 연결 완료, 나머지 병합 필요 · 52e6b843
  Kim, Chaerin authored Jul 28, 2021
  
  52e6b843
- 영상 연결 완료 · dd4deb05
  Kim, Chaerin authored Jul 28, 2021
  
  dd4deb05
- client socket 추가 · d08af57f
  Kim, Chaerin authored Jul 28, 2021
  
  d08af57f
- server client socket 연결 완료 · 1900ab08
  Kim, Chaerin authored Jul 28, 2021
  
  1900ab08
26 Jul, 2021 2 commits
- 처음부터 다시 클라이언트 · e8f19465
  Kim, Chaerin authored Jul 26, 2021
  
  e8f19465
- 초기 환경 설정 변경 · 2bf918de
  Kim, Chaerin authored Jul 26, 2021
  
  2bf918de
23 Jul, 2021 6 commits
- Merge branch 'merge' into 'master' · 2eab9ded
  Kim, Chaerin authored Jul 23, 2021
```
Merge

See merge request research/bora_it!9
```
  2eab9ded
- type password 지정 · 4f8c8f13
  Kim, Chaerin authored Jul 23, 2021
  
  4f8c8f13
- Merge remote-tracking branch 'origin/jiweon827' into merge · 878528b8
  Kim, Chaerin authored Jul 23, 2021
  
  878528b8
- Merge remote-tracking branch 'origin/seoyeon2' into merge · c00faaf3
  Kim, Chaerin authored Jul 23, 2021
  
  c00faaf3
- Merge branch 'cherry2' · eaa0070d
  Kim, Chaerin authored Jul 23, 2021
  
  eaa0070d
- screen server 연결 · c798dc3c
  Kim, Chaerin authored Jul 23, 2021
  
  c798dc3c