From: Jani Nikula <jani@nikula.org>
Date: Thu, 1 May 2014 17:48:17 +0000 (+0300)
Subject: wikiwriteaccess: licensing
X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=commitdiff_plain;h=e3df2c12003271a93cdd465e6b2400874bf165f2

wikiwriteaccess: licensing
---

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.