diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
commit | 0e7099174fdef951c81880b51e23342fcde86374 (patch) | |
tree | 28e99fd804674e3ac025a73a061c73f0ce6d7870 /LICENSE | |
parent | 3ac4d6249f50627c0827ce3812eb21d5b89ed974 (diff) | |
parent | bf36ba5e988a7bb3f163ed0575020ef714519edc (diff) |
Merge remote-tracking branch 'shared/master' into riseup
Conflicts:
README
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -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 |