summaryrefslogtreecommitdiffstats
path: root/COPYING.md
diff options
context:
space:
mode:
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 00000000..cac0b19d
--- /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.