summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani@nikula.org>2014-05-01 20:48:17 +0300
committerJani Nikula <jani@nikula.org>2014-05-01 20:48:17 +0300
commite3df2c12003271a93cdd465e6b2400874bf165f2 (patch)
treecb8535323f11072f8e1e78aaf1619f99312a5b4a
parent4103d983518f98168d95fb714421147df2baf4ad (diff)
wikiwriteaccess: licensing
-rw-r--r--wikiwriteaccess.mdwn11
1 files changed, 11 insertions, 0 deletions
diff --git a/wikiwriteaccess.mdwn b/wikiwriteaccess.mdwn
index cfced40..090fa0b 100644
--- a/wikiwriteaccess.mdwn
+++ b/wikiwriteaccess.mdwn
@@ -21,3 +21,14 @@ and push back to the wiki:
The syntax used on the pages is [markdown](http://daringfireball.net/projects/markdown/syntax). In order to preview your modifications you can copy and paste the page in this [online preview](http://daringfireball.net/projects/markdown/dingus).
+
+## License
+
+We are in the process of updating the wiki license. By pushing to the repository
+you agree that all of your contributions to the notmuch wiki will be dual
+licensed under:
+
+- [CC-BY-SA-3.0](http://creativecommons.org/licenses/by-sa/3.0/) <img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png" />
+
+- [The GNU General Public License](http://www.gnu.org/licenses/gpl.txt), either
+ version 3.0 or at your option any later version.