summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-15 12:47:12 -0400
committerMicah Anderson <micah@riseup.net>2013-04-15 12:47:12 -0400
commit0e7099174fdef951c81880b51e23342fcde86374 (patch)
tree28e99fd804674e3ac025a73a061c73f0ce6d7870 /LICENSE
parent3ac4d6249f50627c0827ce3812eb21d5b89ed974 (diff)
parentbf36ba5e988a7bb3f163ed0575020ef714519edc (diff)
Merge remote-tracking branch 'shared/master' into riseup
Conflicts: README
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE10
1 files changed, 10 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..4b46720
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,10 @@
+written by immerda project group
+admin+puppet(at)immerda.ch
+
+adapted by Puzzle ITC
+haerry+puppet(at)puzzle.ch
+
+original idea by David Schmitt
+<david(at)schmitt.edv-bus.at>
+
+License: GPLv3