Merge branch 'fixes' into 'master'

kotct / docket-old

DISCONTINUED: A docket application.

3 stars 0 forks source link

Merge branch 'fixes' into 'master' #29

Closed rye closed 10 years ago

rye commented 10 years ago

Does this sound good to everyone? I'm not sure if stuff will die, but it looks like fixes was branched from master, so merging back should be A-okay.

Sammidysam commented 10 years ago

It can be automatically merged, which means that there are no merge conflicts. Do you want this to be 0.1.2?

rye commented 10 years ago

I suppose all of the fixes could constitute a 0.1.2 release

Sammidysam commented 10 years ago

I think so, too. Enough of them pertain to the end user anyway (and bug fixes are always nice).

cg505 commented 10 years ago

Then let's merge it.

rye commented 10 years ago

Okay.

cg505 commented 10 years ago

You doing the release?

Sammidysam commented 10 years ago

We should make the release. I'll do so if I get time tomorrow, but if anybody else can, go ahead. Also look at the new fixes and decide if they should be merged, too.

cg505 commented 10 years ago

Go ahead.