github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2024-11-22 06:24:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

DMCA Agreement

Browse Source 
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.
This commit is contained in:
Bruno Pinto 2015-09-26 16:45:08 +01:00
parent 61019c7378
commit 6527ec86f3
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
AUTHORS Normal file
View File

@ -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 <brunoferreirapinto@gmail.com>
Jorge Bucaran <jbucaran@me.com>
Justin Hileman <github@0x7f.us>
Daniel Banck <daniel@dbanck.de>
Derek Stavis <dekestavis@gmail.com>
jeremiejig <me@jeremiejig.fr>
Nathan Wykes <nwykes@gmail.com>
Natrim <maly@kinet.cz>
Pablo Santiago Blum de Aguiar <scorphus@gmail.com>
Pyry-Samuli Lahti <pyppe@iki.fi>
Stephen Coakley <me@stephencoakley.com>
Tom Hensel <github@jitter.eu>
Twan Coenraad <twan@coenraad.at>
Wild Kat <wk@futureinquestion.net>

2
LICENSE
View File

@ -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