Code

Update coc#1908

Code

Merged

chrisvfritz merged 4 commits intovuejs:mastervuejs/v2.vuejs.org:masterfrom

jschatz1:update-cocjschatz1/vuejs.org:update-cocCopy head branch name to clipboard

Dec 15, 2018

Commits

Commits on Sep 28, 2018

• Adds Code Of Conduct via contributor-covenant version 1.4

  

  Jacob Schatz

  committed
  c465d27

  Copy full SHA for c465d27

Commits on Dec 15, 2018

• Merge remote-tracking branch 'upstream/master'

  

  Jacob Schatz

  committed
  34d3386

  Copy full SHA for 34d3386

• Change community email

  

  Jacob Schatz

  committed
  d1f9958

  Copy full SHA for d1f9958

• Resolve conflict

  

  Jacob Schatz

  committed
  8a9df34

  Copy full SHA for 8a9df34