summaryrefslogtreecommitdiffstats
path: root/COPYING.md
diff options
context:
space:
mode:
authorAmin Bandali <bandali@gnu.org>2020-07-18 19:20:17 -0400
committerAmin Bandali <bandali@gnu.org>2020-07-18 19:20:17 -0400
commitfce174d2428779e3b7edbf0d279332129376edff (patch)
tree44714692f4408f3fb39d276e8a7843865a162e7f /COPYING.md
parentbb14e56d8fe6f45835af3a32125f897ae1e289a3 (diff)
downloademacsconf-wiki-fce174d2428779e3b7edbf0d279332129376edff.tar.xz
emacsconf-wiki-fce174d2428779e3b7edbf0d279332129376edff.zip
add license texts for CC BY-SA 4.0 and GPLv3+
Diffstat (limited to 'COPYING.md')
-rw-r--r--COPYING.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/COPYING.md b/COPYING.md
new file mode 100644
index 0000000..cac0b19
--- /dev/null
+++ b/COPYING.md
@@ -0,0 +1,8 @@
+Except where otherwise noted, the material on the EmacsConf wiki are
+dual-licensed under the terms of the Creative Commons
+Attribution-ShareAlike 4.0 International; and the GNU General Public
+License as published by the Free Software Foundation, either version 3
+of the License, or (at your option) any later version.
+
+Copies of these two licenses are included in the EmacsConf wiki
+repository, in the [[COPYING.GPL]] and [[COPYING.CC-BY-SA]] files.