Code

Doc office fix#37507

Code

Merged

ZhilkinSerg merged 5 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom RarkGrames:Doc-officeRarkGrames/Cataclysm-DDA:Doc-officeCopy head branch name to clipboardJan 29, 2020

+3-3

Commits

Commits on Jan 28, 2020

• Undergarment.json and tool_armor.json

  RarkGrames

  committed
  873c253

• Revert "Undergarment.json and tool_armor.json"

  Show description for d146613
  RarkGrames

  committed
  d146613

• Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA

  RarkGrames

  committed
  52a3f40

Commits on Jan 29, 2020

• Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA

  RarkGrames

  committed
  4a0b5e1

• Update office_doctor.json

  RarkGrames

  committed
  279e87f