Merge 0.12.1 branch into master #866

Closed
wants to merge 9 commits into
from

Projects

None yet

2 participants

@ghost
ghost commented Mar 17, 2013

Is there a reason 0.12.1 hasn't been merged into the main development branch?

It's mainly a formality since many of the changes are already duplicated on master (e.g. changing :rubygems to https://rubygems.org in Gemfile). But it's a little strange that 0.12.1 doesn't appear in History.txt on master.

@parkr
Member
parkr commented Mar 17, 2013

We wanted to release a patch for Kramdown 0.14.x but not merge it into the main repo.

@parkr parkr closed this Mar 17, 2013
@mojombo
Contributor
mojombo commented Mar 18, 2013

@parkr It probably makes sense to just copy the 0.12.1 section from History.txt into the right place in that file on master, just so there's a record of it happening.

@parkr
Member
parkr commented Mar 18, 2013

@mojombo Fair enough. Done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment