Merge branch 'master' of github.com:remy/mit-license

Conflicts:
	users/jesusurrutia.json
	users/leanix.json
	users/wilddog.json

CODE_OF_CONDUCT.md

@@ -0,0 +1,22 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

themes/eula-modern.css

@@ -37,6 +37,7 @@ article {
   max-width: 700px;
   margin: 10px auto 0px;
   text-align: justify;
+  margin-top: -65px;
 }
 
 @media (max-device-height: 699px) {
@@ -47,7 +48,7 @@ article {
 }
 
 h1 {
-  font-size: 4.2em;
+  font-size: 3.8em;
   font-family: Segoe UI Light,'SegoeUILightWF',Arial,sans-serif;
   line-height: .9em;
   color: #000;
@@ -127,7 +128,7 @@ footer a:visited {
   position: relative;
   float: right;
   border: 3px solid #ccc;
-  top: -4.3em;
+  top: 4.5em;
   z-index: 1;
   border-radius: 10px;
-}
+}

users/aditya.json

@@ -0,0 +1 @@
+{"copyright":"Aditya Prakash","url":"http:\/\/adityaprakash.in","email":"me@adityaprakash.in","format":"html"}

users/afonsof.json

@@ -0,0 +1 @@
+{"copyright":"Afonso F","url":"http:\/\/afonsof.com","email":"me@afonsof.com","format":"html","gravatar":true}

users/ahsanhabib.json

@@ -0,0 +1 @@
+{"copyright":"Ahsan Habib"}

users/alexgleason.json

@@ -0,0 +1 @@
+{"copyright":"Alex Gleason"}

users/amjad.json

@@ -0,0 +1 @@
+{"copyright":"Amjad Ali","email":"amjad.4@gmail.com","format":"txt"}

users/avdaredevil.json

@@ -0,0 +1 @@
+{"copyright":"Apoorv Verma","url":"https:\/\/www.linkedin.com\/in\/apoorvverma","email":"avdaredevil@gmail.com","format":"txt","gravatar":true}

users/briends.json

@@ -0,0 +1 @@
+{"copyright":"Briends GmbH"}

users/brummelte.json

@@ -0,0 +1 @@
+{"copyright":"Jan Brummelte","url":"http:\/\/jan-brummelte.de","email":"mit-license.org@jan-brummelte.de","format":"html","theme":"double-windsor"}

users/ckaznocha.json

@@ -1 +1,6 @@
-{"copyright":"Clifton Kaznocha"}
+{
+  "copyright": "Clifton Kaznocha",
+  "url": "http://clifton.kaznocha.com",
+  "email": "clifton@kaznocha.com",
+  "gravatar": true
+}

users/darrennoble.json

@@ -0,0 +1 @@
+{"copyright":"Darren Noble","email":"darren@nobled.com","gravatar":true,"theme":"default-dark"}

users/delphidabbler.json

@@ -0,0 +1 @@
+{"copyright":"Peter D Johnson","url":"http:\/\/delphidabbler.com\/","format":"text","version":"fdcf640"}

users/efries.json

@@ -0,0 +1 @@
+{"copyright":"Ernesto Fries Urioste"}

users/ether.json

@@ -0,0 +1 @@
+{"copyright":"Ether Creative","url":"http:\/\/ethercreative.co.uk","email":"hello@ethercreative.co.uk"}

users/fremy.json

@@ -0,0 +1,6 @@
+{
+  "copyright": "REMY François, http://fremycompany.com/",
+  "url": "http://fremycompany.com/",
+  "email": "francois.remy.dev@outlook.com",
+  "gravatar": true
+}

users/igneous.json

@@ -0,0 +1 @@
+{"copyright":"Bucky Wolfe"}

users/indutny.json

@@ -0,0 +1 @@
+{"copyright":"Fedor Indutny"}

users/inetpeople.json

@@ -0,0 +1 @@
+{"copyright":"inetpeople"}

users/is-uz.json

@@ -0,0 +1 @@
+{"copyright":"Leandro Matos","url":"http:\/\/is-uz.com","email":"leandro@is-uz.com","format":"txt"}

users/ivangaravito.json

@@ -0,0 +1 @@
+{"copyright":"Ivan Garavito","url":"https:\/\/github.com\/IvanGaravito\/","email":"ivangaravito@gmail.com","theme":"default","gravatar":true}

users/jesusurrutia.json

@@ -1 +1,12 @@
-{"copyright":"Jes\u00fas Urrutia"}
+<<<<<<< HEAD
+{"copyright":"Jes\u00fas Urrutia"}
+=======
+{
+    "copyright": "",
+    "url": "http://jesusurrutia.com",
+    "email": "jesus.urrutia@gmail.com",
+    "version": "html",
+    "gravatar": true,
+    "theme": "default"
+}
+>>>>>>> 5cdf872c4b54d30d552dd9787113f6275afdc7bd

users/joelself.json

@@ -0,0 +1 @@
+{"copyright":"Joel Self"}

users/julien-breux.json

@@ -0,0 +1 @@
+{"copyright":"Julien Breux"}

users/kai.json

@@ -0,0 +1 @@
+{"copyright":"Kai Wang","url":"http:\/\/openbioinformatics.org","email":"kai@openbioinformatics.org","format":"txt"}

users/kaichop.json

@@ -0,0 +1 @@
+{"copyright":"Kai Wang"}

users/leandromatos.json

@@ -0,0 +1 @@
+{"copyright":"Leandro Matos","url":"http:\/\/is-uz.com","email":"leandro@is-uz.com","format":"txt"}

users/leanix.json

@@ -1 +1,5 @@
-{"copyright":"Andre Christ","url":"https:\/\/leanix.net","email":"support@leanix.net","format":"txt"}
+<<<<<<< HEAD
+{"copyright":"Andre Christ","url":"https:\/\/leanix.net","email":"support@leanix.net","format":"txt"}
+=======
+{"copyright":"LeanIX GmbH, https:\/\/leanix.net","url":"https:\/\/leanix.net", "email": "support@leanix.net", "format": "txt"}
+>>>>>>> 5cdf872c4b54d30d552dd9787113f6275afdc7bd

users/marco.json

@@ -1,4 +1,4 @@
 {
   "copyright": "Marco Krage, http://my-azur.de",
-  "url": "http://my-azur.de"
+  "url": "https://my-azur.de"
 }

users/matthewmcvickar.json

@@ -0,0 +1 @@
+{"copyright":"Matthew McVickar","url":"http:\/\/matthewmcvickar.com","email":"matthew@matthewmcvickar.com","format":"txt"}

users/mc2.json

@@ -0,0 +1 @@
+{"copyright":"MC2","url":"http:\/\/mc2.com.tr","email":"contact@mc2.com.tr","gravatar":true}

users/microsoft.json

@@ -0,0 +1 @@
+{"copyright":"Microsoft","url":"http:\/\/microsoft.com"}

users/ngtk.json

@@ -0,0 +1 @@
+{"copyright":"Kent Nagata"}

users/phansible.json

@@ -1 +0,0 @@
-{"copyright":"Phansible","url":"http:\/\/phansible.com","format":"txt"}

users/phm.json

@@ -0,0 +1 @@
+{"copyright":"P. H. Madore","url":"http:\/\/phm.link","email":"moonpunter@gmail.com","format":"txt"}

users/prashcr.json

@@ -0,0 +1,6 @@
+{
+  "copyright": "Prashanth Chandra",
+  "url": "http:\/\/prashcr.xyz",
+  "email": "hi@prashcr.xyz",
+  "theme": "flesch"
+}

users/rcta.json

@@ -0,0 +1 @@
+{"copyright":"Rick Culpepper","url":"http:\/\/ternaryalchemy.com","email":"rick@ternaryalchemy.com","format":"html"}

users/revi.json

@@ -1,6 +1,6 @@
 {
-  "copyright": "Yongmin Hong (Revi), https://www.revi.pe.kr",
-  "url": "https://www.revi.pe.kr",
-  "email": "revi@member.fsf.org",
+  "copyright": "Yongmin Hong (Revi), https://revi.me",
+  "url": "https://revi.me",
+  "email": "revi@pobox.com",
   "theme": "cherry"
 }

users/rizky.json

@@ -0,0 +1 @@
+{"copyright":"Rizky Farhan","email":"rizky.farhan@gmail.com"}

users/roberthernandez.json

@@ -0,0 +1 @@
+{"copyright":"Robert David Hernandez","url":"http:\/\/RobertHernandez.io","email":"RHernandez513@gmail.com","format":"html","theme":"solarized"}

users/rx14.json

@@ -0,0 +1 @@
+{"copyright":"Chris Hobbs"}

users/shagun.json

@@ -0,0 +1 @@
+{"copyright":"Shagun Sodhani","url":"https:\/\/shagunsodhani.in","email":"sshagunsodhani@gmail.com","format":"txt"}

users/succhiello.json

@@ -0,0 +1 @@
+{"copyright":"Satoshi Ebihara","url":"https:\/\/github.com\/succhiello"}

users/tam.json

@@ -0,0 +1 @@
+{"copyright":"Tam McDonald","url":"http:\/\/tam.sx","email":"hi@tam.sx","gravatar":true}

users/tdue21.json

@@ -0,0 +1,5 @@
+{
+  "copyright": "Thomas Due",
+  "email": "tho.due@gmail.com",
+  "gravatar": true
+}

users/ugurceylan.json

@@ -0,0 +1 @@
+{"copyright":"Uğur CEYLAN","url":"https://github.com/ugurceylan","theme":"ecijol","gravatar": true}

users/victor.json

@@ -0,0 +1 @@
+{"copyright":"Victor Nogueira","email":"felladrin@gmail.com","gravatar":true,"theme":"black-beauty"}

users/wglab.json

@@ -0,0 +1 @@
+{"copyright":"Wang Genomics Lab"}

users/wilddog.json

@@ -1 +1,5 @@
-{"copyright":"wilddog"}
+<<<<<<< HEAD
+{"copyright":"wilddog"}
+=======
+{"copyright":"Wilddog","url":"https:\/\/wilddog.com", "email":"opensource@wilddog.com"}
+>>>>>>> 5cdf872c4b54d30d552dd9787113f6275afdc7bd

users/zaploink.json

@@ -0,0 +1 @@
+{"copyright":"Kaspar von Gunten","url":"http:\/\/code.zaploink.org","email":"zaploink@code.zaploink.org","theme":"eula-modern"}