Code

Tsukasa#34

Code

Closed

Highmt wants to merge 7 commits intodevelopshortintern2020-A-labyrinth/TeamA:developfrom tsukasashortintern2020-A-labyrinth/TeamA:tsukasaCopy head branch name to clipboard

+108-26

Commits

Commits on Aug 25, 2020

• img_url

  tsukasa2

  committed
  8cb4333

  Copy full SHA for 8cb4333

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into tsukasa

  tsukasa2

  committed
  1f0210c

  Copy full SHA for 1f0210c

Commits on Aug 26, 2020

• resolved conflict

  tsukasa2

  committed
  39e69e0

  Copy full SHA for 39e69e0

• Merge branch 'develop' of https://github.com/shortintern2020-A-labyrinth/TeamA into tsukasa

  tsukasa2

  committed
  f3eb656

  Copy full SHA for f3eb656

• convert emoji

  tsukasa2

  committed
  ff1ccbd

  Copy full SHA for ff1ccbd

• insertEmolog

  tsukasa2

  committed
  18abc6d

  Copy full SHA for 18abc6d

• insertEmolog

  tsukasa2

  committed
  668bc01

  Copy full SHA for 668bc01