sjs/mit-license
1
0
Fork 0
mirror of https://github.com/samsonjs/mit-license.git synced 2026-03-29 10:05:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merge conflict

Browse source
This commit is contained in:
Remy Sharp 2011-12-15 20:23:05 +00:00
commit 0043c6948e
4 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
users/bryan.json Normal file
View file

@ -0,0 +1,5 @@
{
"copyright": "Bryan Irace, http://bryanirace.com",
"url": "http://bryanirace.com",
"theme": "flesch"
}

6
users/freshmade.json
View file

@ -1 +1,5 @@
{"copyright":"jack @ freshma.de"}
{
"copyright": "Jack Keller, http://freshma.de",
"url": "http://freshma.de",
"theme": "flesch"
}

6
users/ricardo.json Normal file
View file

@ -0,0 +1,6 @@
{
"copyright": "Ricardo Tomasi",
"url": "http://ricardo.cc/",
"email": "ricardobeat@gmail.com",
"theme": "flesch"
}

5
users/yudoufu.json Normal file
View file

@ -0,0 +1,5 @@
{
"copyright": "Daichi Kamemoto(a.k.a:yudoufu)",
"url": "http://yudoufu.com/",
"theme": "default"
}