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

Add Pepperminty Wiki #556

Merged
merged 4 commits into from May 26, 2016
Merged

Add Pepperminty Wiki #556

merged 4 commits into from May 26, 2016

Conversation

sbrl
Copy link
Contributor

@sbrl sbrl commented May 19, 2016

For the last year I've been working on Pepperminty Wiki, and I thought I'd add it here. It's an entire markdown-powered wiki built into a single file. It's currently very usable, but I have plans to bring a bunch of big features to it which I'll be working on whenever I get some time.

@nodiscc
Copy link
Member

nodiscc commented May 19, 2016

Thank you

Edit: the license should be MPLv2 for consistence wit the licenses list.

By the way this license is quite rare (Conversejs, Bugzilla, Syncthing in the list). @sbrl what's the reason for choosing it over more common licenses? Thanks again.

@sbrl
Copy link
Contributor Author

sbrl commented May 20, 2016

@nodiscc Right - I'll change the license to the appropriate code.

As for the reason, licenses confuse me rather (that's why I used tldrlegal to pick it), and I wanted a fairly permissive license that requires attribution. I don't understand all this stuff about patents and sublicensing and trademarks etc. If you've got a more suitable license, I'd be glad to change it.

@sbrl
Copy link
Contributor Author

sbrl commented May 26, 2016

@nodiscc I've updated the license code. Is that ok?

@nodiscc
Copy link
Member

nodiscc commented May 26, 2016

Nope, please merge https://github.com/sbrl/awesome-selfhosted/pull/1

Fix license, MPL2 -> MPLv2
@sbrl
Copy link
Contributor Author

sbrl commented May 26, 2016

@nodiscc Ummm oops! Thanks for the PR. I've merged it in.

@Kickball Kickball merged commit 00895a9 into awesome-selfhosted:master May 26, 2016
@sbrl
Copy link
Contributor Author

sbrl commented May 26, 2016

Yeah! Thanks for adding my Wiki software!

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

Successfully merging this pull request may close these issues.

None yet

3 participants