合并上游代码, 并处理冲突 - Githubissues

thoughtbot / griddler

Simplify receiving email in Rails (deprecated)

http://griddler.io/

MIT License

1.38k stars 199 forks source link

合并上游代码, 并处理冲突 #289

Closed wppurking closed 7 years ago

wppurking commented 7 years ago

Sorry mistake.

There should be my repo merge.

I`am so sorry for this.