search

Themekraft / _tk

Themekraft Starter Theme
GNU General Public License v3.0
430 stars 158 forks source link

Theme Check + Font Awesome #37

Closed macdonaldr93 closed 9 years ago

macdonaldr93 commented 9 years ago

Hi @svenl77 ,

Just did another update. I just updated Font Awesome to the most recent version. Also, I updated the theme to meet more Theme Check points. Pretty minor changes. I hope you're cool with the pull requests.

Thanks again! @macdonaldr93

ginsterbusch commented 9 years ago

Sweet. Gonna dig into it. Got a bootstrap update to the latest 3.3.1 sitting around here as well ;)

svenl77 commented 9 years ago

We can’t automatically merge this pull request. I have dona a commit before and now there are conflicts.

@ginsterbusch do you know how to merge this without losing my work?

macdonaldr93 commented 9 years ago

If there's anything I can help with, let me know.

macdonaldr93 commented 9 years ago

Hey, I resolved conflicts and this pull request is ready to go if you'd like it. Thanks!

svenl77 commented 9 years ago

@macdonaldr93 looks great now ;) thanks!

macdonaldr93 commented 9 years ago

haha thanks. I finally had time to merge with the upstream.