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

Merge for multiple PRs #55

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

StephenPCG
Copy link
Contributor

Hi duilio,

I'm sorry I didn't reply for those pull requests in time, I was just too busy these two weeks.
Since there are 4 pull requests that are waiting for updating README, I just created a new PR, merged that four branches, and updated README at once. You can close that four PRs.

StephenPCG added 14 commits May 26, 2014 00:31
Conflicts:
	templates/_includes/disqus_script.html
* for page and article, one can use ``asides`` to control which asides
  to show on individual page:

    title: awesome title
    author: awesome author
    asides: recentpost, categories, tags, ...

* if ``article.asides`` is not defined, use ``ARTICLE_ASIDES``
* if ``page.asides`` is not defined, use ``PAGE_ASIDES``
* for pages other than article or page, e.g. index.html,
  categories.html, etc., use ``INDEX_ASIDES``
* if none of above is defined, use all
Conflicts:
	templates/_includes/sidebar.html
@duilio
Copy link
Owner

duilio commented Jan 3, 2015

Hi Stephen, I'm even later as you notice :-)
I've merged some other PR in the meantime and unluckily this has has some conflicts now :-(

@duilio
Copy link
Owner

duilio commented Jan 3, 2015

Also you may add your name in the author list ;-)

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