search

fedwiki / wiki-server

Federated Wiki client and server in Node.js
Other
153 stars 35 forks source link

forward Smallest Federated Wiki #84

Closed WardCunningham closed 9 years ago

WardCunningham commented 9 years ago

Addendum to #81

WardCunningham commented 9 years ago

What do you mean you can't automatically merge? What have I done wrong now? No, I don't really want to know. I thought I dealt with the branch rename properly. I don't know how to fix this in the few minutes I have before going to work. Sorry.

paul90 commented 9 years ago

Probably because I had already done it...

paul90 commented 9 years ago

just looked, just down to me having a merged in a number of other updates, as well as creating a Smallest Federated Wiki page.

All merged now :smile: