Commits on Sep 30, 2019

1. add code of conduct and conflict resolution

   

   szha committed Sep 30, 2019
   Configuration menu

   • View commit details
   • Copy full SHA for fd16b0e
   • Browse repository at this point

   Copy the full SHA

   fd16b0e View commit details

   Browse the repository at this point in the history