1. 08 Apr, 2021 12 commits
  2. 07 Apr, 2021 13 commits
  3. 06 Apr, 2021 9 commits
  4. 05 Apr, 2021 4 commits
  5. 02 Apr, 2021 2 commits
    • Merge branch 'origin/develop_apply_design' into release_sp3 · f9f13056
      # Conflicts:
      #	public/css/chat.css
      #	public/js/language_en.js
      #	public/js/language_ja.js
      #	public/js/language_ko.js
      #	public_new/archive.html
      #	public_new/archive_detail.html
      #	public_new/chat.html
      #	public_new/chat_add_user.html
      #	public_new/chat_add_user_confirm.html
      #	public_new/chat_change_room_name.html
      #	public_new/chat_make_room.html
      #	public_new/chat_make_room_confirm.html
      #	public_new/chat_room.html
      #	public_new/collaboration_overlay_add_user_list.html
      #	public_new/contact.html
      #	public_new/css/archive.css
      #	public_new/css/chat.css
      #	public_new/css/common.css
      #	public_new/js/archive.js
      #	public_new/js/chat.js
      #	public_new/js/common.js
      #	public_new/js/constant.js
      #	public_new/js/contact.js
      #	public_new/js/loading.js
      #	public_new/search_message_user_list.html
      Lee Munkyeong committed
    • Merge branch 'origin/develop_apply_design_chat' into 'origin/develop_apply_design' · d3ad4728
      Origin/develop apply design chat
      
      See merge request !17
      Lee Munkyeong committed