Remove market #64

Merged
merged 1 commit into from Jan 26, 2013

Conversation

Projects
None yet
2 participants
@Borkason
Member

Borkason commented Jan 19, 2013

No description provided.

@skinkie

This comment has been minimized.

Show comment Hide comment
@skinkie

skinkie Jan 26, 2013

Member

Could you do me a favor making this (and the other one) automatically be merged again? I'll apply them directy, just checked them both.

Member

skinkie commented Jan 26, 2013

Could you do me a favor making this (and the other one) automatically be merged again? I'll apply them directy, just checked them both.

@Borkason

This comment has been minimized.

Show comment Hide comment
@Borkason

Borkason Jan 26, 2013

Member

@skinkie, have you had the opportunity to test this? It's quite a while since I finished work on this branch. My webserver is running with this branch for three weeks without issues.

Member

Borkason commented Jan 26, 2013

@skinkie, have you had the opportunity to test this? It's quite a while since I finished work on this branch. My webserver is running with this branch for three weeks without issues.

@ghost ghost assigned skinkie Jan 26, 2013

@skinkie

This comment has been minimized.

Show comment Hide comment
@skinkie

skinkie Jan 26, 2013

Member

Yes, but I guess I just commited something which is the reason I cannot merge it anymore(?). I have tested it directly from your branch. (Similar to your icons work)

Member

skinkie commented Jan 26, 2013

Yes, but I guess I just commited something which is the reason I cannot merge it anymore(?). I have tested it directly from your branch. (Similar to your icons work)

@Borkason

This comment has been minimized.

Show comment Hide comment
@Borkason

Borkason Jan 26, 2013

Member

Hi Skinkie, would you try it again now?

Member

Borkason commented Jan 26, 2013

Hi Skinkie, would you try it again now?

@skinkie

This comment has been minimized.

Show comment Hide comment
@skinkie

skinkie Jan 26, 2013

Member

"This pull request cannot be automatically merged." :(

Member

skinkie commented Jan 26, 2013

"This pull request cannot be automatically merged." :(

skinkie added a commit that referenced this pull request Jan 26, 2013

Merge pull request #64 from Borkason/remove-market
Remove market from the admin, it isn't online anymore. Thanks Borkason for these patches.

@skinkie skinkie merged commit 0bdffce into cherokee:master Jan 26, 2013

@Borkason Borkason deleted the Borkason:remove-market branch Jan 26, 2013

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