From 6527ec86f39899bba4020a7362f865677a96a41a Mon Sep 17 00:00:00 2001 From: Bruno Pinto Date: Sat, 26 Sep 2015 16:45:08 +0100 Subject: [PATCH] DMCA Agreement This is the message sent to GitHub with for the reconciliation: > I have talked to @bpinto and his other collaborators and decided that is > the best for everyone to reconcile and conclude our litigation amicably > with the following conditions: > > * The license read Copyright (c) 2015 Oh My Fish! > * AUTHORS file. > * Bruno and Justin remain as admins. > * Scorphus, derekstavis and bucaran become collaborators. > * We swear not to fight over copyright issues again. > > You may have the DMCA revoked at your earliest convenience. --- AUTHORS | 18 ++++++++++++++++++ LICENSE | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..45573ed --- /dev/null +++ b/AUTHORS @@ -0,0 +1,18 @@ +# This file lists all individuals having contributed content to the repository. +# git log --format='%aN <%aE>' | env LC_ALL=C.UTF-8 sort -uf + +Bruno Pinto +Jorge Bucaran +Justin Hileman +Daniel Banck +Derek Stavis +jeremiejig +Nathan Wykes +Natrim +Pablo Santiago Blum de Aguiar +Pyry-Samuli Lahti +Stephen Coakley +Tom Hensel +Twan Coenraad +Wild Kat + diff --git a/LICENSE b/LICENSE index a439b2e..21a6f3e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 Bruno Ferreira Pinto +Copyright (c) 2015 Oh My Fish! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal