Merge branch 'master' into DepauMD

This commit is contained in:
Davide Depau 2018-10-08 03:00:10 +02:00
commit aaf4f0ae96
2 changed files with 6 additions and 2 deletions

View file

@ -68,7 +68,7 @@ Just to more confusion: We are still friends with HackMD :heart:
### Prerequisite ### Prerequisite
- Node.js 6.x or up (test up to 7.5.0) - Node.js 6.x or up (test up to 7.5.0) and <10.x
- Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL) use charset `utf8` - Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL) use charset `utf8`
- npm (and its dependencies, especially [uWebSockets](https://github.com/uWebSockets/uWebSockets#nodejs-developers), [node-gyp](https://github.com/nodejs/node-gyp#installation)) - npm (and its dependencies, especially [uWebSockets](https://github.com/uWebSockets/uWebSockets#nodejs-developers), [node-gyp](https://github.com/nodejs/node-gyp#installation))
- For **building** CodiMD we recommend to use a machine with at least **2GB** RAM - For **building** CodiMD we recommend to use a machine with at least **2GB** RAM

View file

@ -143,11 +143,15 @@
"Markdown", "Markdown",
"Notes" "Notes"
], ],
"homepage": "https://hackmd.io", "homepage": "https://codimd.org",
"maintainers": [ "maintainers": [
{ {
"name": "Max Wu", "name": "Max Wu",
"email": "jackymaxj@gmail.com" "email": "jackymaxj@gmail.com"
},
{
"name": "Christoph (Sheogorath) Kern",
"email": "codimd@sheogorath.shivering-isles.com"
} }
], ],
"repository": { "repository": {