X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=wikiwriteaccess.mdwn;fp=wikiwriteaccess.mdwn;h=090fa0bb716c72873577af4e26296bc51d6d9ee6;hb=e3df2c12003271a93cdd465e6b2400874bf165f2;hp=cfced40228779d70934392a295daba36be55a9e7;hpb=4103d983518f98168d95fb714421147df2baf4ad;p=notmuch-wiki

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.