Code

Feature/git conflict 1#109

Code

Open

HEROGWP wants to merge 2 commits into5fpro:master5fpro/rails4-template:masterfrom HEROGWP:feature/git-conflict-1HEROGWP/rails4-template:feature/git-conflict-1Copy head branch name to clipboard

+3

Commits

Commits on Dec 5, 2016

• modify readme

  

  marsz

  authored and

  HEROGWP

  committed
  30212dd

  Copy full SHA for 30212dd

• modify capfile

  

  marsz

  authored and

  HEROGWP

  committed
  a14d998

  Copy full SHA for a14d998