liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #283 from Requarks/master

Browse Source 
Master to dev
This commit is contained in:
Nicolas Giard 2017-10-22 13:23:03 -04:00 committed by GitHub
commit dd47ba8c66
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -111,6 +111,7 @@ Current and upcoming milestones *(major features only, see the [changelog](https
## Gitter ## Gitter
Want to discuss features, ideas or issues? Join our [gitter channel](https://gitter.im/Requarks/wiki). We are very active and friendly! Want to discuss features, ideas or issues? Join our [gitter channel](https://gitter.im/Requarks/wiki). We are very active and friendly!
[![Chat on Gitter](https://img.shields.io/badge/chat-on_gitter-CC2B5E.svg?style=flat-square&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAMAAADUg/YpAAAABlBMVEUAAAD///%2Bl2Z/dAAAAAXRSTlMAQObYZgAAABVJREFUeAFjwAUYYTQByAAh0WicAAAFnwAYeB5bLwAAAABJRU5ErkJggg==)](https://gitter.im/Requarks/wiki)
## Twitter ## Twitter
@ -126,6 +127,7 @@ We are looking for translators to make Wiki.js available in multiple languages.
- [x] English - [x] English
- [x] Chinese - *Thanks to [@choicky](https://github.com/choicky)* - [x] Chinese - *Thanks to [@choicky](https://github.com/choicky)*
- [x] Dutch - *Thanks to [@weirdwater](https://github.com/weirdwater)* - [x] Dutch - *Thanks to [@weirdwater](https://github.com/weirdwater)*
- [x] Estonian - *Thanks to [@vonforum](https://github.com/vonforum)*
- [x] French - [x] French
- [x] German - *Thanks to [@joetjengerdes](https://github.com/joetjengerdes), [@MyZeD](https://github.com/MyZeD)* - [x] German - *Thanks to [@joetjengerdes](https://github.com/joetjengerdes), [@MyZeD](https://github.com/MyZeD)*
- [x] Japanese - *Thanks to [@johnnyshields](https://github.com/johnnyshields)* - [x] Japanese - *Thanks to [@johnnyshields](https://github.com/johnnyshields)*

3
config.sample.yml
View File

@ -39,9 +39,6 @@ redis:
db: 0 db: 0
password: null password: null
# Enable for right to left languages (e.g. arabic):
langRtl: false
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# Background Workers # Background Workers
# --------------------------------------------------------------------- # ---------------------------------------------------------------------