Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hardcoded favicon name can be configured now #60

Merged
merged 2 commits into from
Jan 5, 2015
Merged

hardcoded favicon name can be configured now #60

merged 2 commits into from
Jan 5, 2015

Conversation

mstreuhofer
Copy link
Contributor

No description provided.

@duilio
Copy link
Owner

duilio commented Jan 3, 2015

The merge is not available anymore, probably due to the previous merges. Mind to fix this?

@mstreuhofer
Copy link
Contributor Author

i rebased my branch to your current master and merged the conflicts. this PR should now merge without issue. please try again.

This was referenced Jan 3, 2015
@duilio
Copy link
Owner

duilio commented Jan 5, 2015

Hey Manuel, thanks! I'm going to merge this now and also the other PRs. Would you like to open a new Pull Request to add your name in the author list? :-)

duilio added a commit that referenced this pull request Jan 5, 2015
hardcoded favicon name can be configured now
@duilio duilio merged commit 2eaa00a into duilio:master Jan 5, 2015
@mstreuhofer mstreuhofer deleted the favicon branch January 5, 2015 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants