Video icon style - Githubissues

Frames-Proj / frames

6 stars 6 forks source link

Closed ethanpailes closed 7 years ago

ethanpailes commented 7 years ago

I resolved the merge conflicts by merging master in. After merging this, the whole branch should be rebased on master before merge.