Code

update upstream#1

Code

Merged

gilvaju merged 4 commits intogilvaju:mastergilvaju/genesis:masterfrom phpzm:masterphpzm/genesis:masterCopy head branch name to clipboardDec 20, 2017

+16-8

Commits

Commits on Nov 29, 2017

• Merge pull request #10 from gilvaju/master

  Show description for 0e8f314
  wilcorrea

  authored
  0e8f314

Commits on Dec 8, 2017

• Update color.vue

  BlackMix

  authored
  c1eba28

Commits on Dec 19, 2017

• Merge pull request #11 from gilvaju/master

  Show description for a52d8e9
  wilcorrea

  authored
  a52d8e9

• Merge pull request #12 from BlackMix/patch-2

  Show description for aac589c
  wilcorrea

  authored
  aac589c