mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-27 03:41:02 +00:00
Merge branch 'master' into dev
This commit is contained in:
commit
cfa2ef3a05
4 changed files with 6 additions and 3 deletions
2
.gitattributes
vendored
Normal file
2
.gitattributes
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
* linguist-vendored
|
||||||
|
*.rs linguist-vendored=false
|
3
README.md
vendored
3
README.md
vendored
|
@ -39,6 +39,7 @@ Front Page|Post
|
||||||
- Clean, mobile-friendly interface.
|
- Clean, mobile-friendly interface.
|
||||||
- i18n / internationalization support.
|
- i18n / internationalization support.
|
||||||
- NSFW post / community support.
|
- NSFW post / community support.
|
||||||
|
- Cross-posting support.
|
||||||
- High performance.
|
- High performance.
|
||||||
- Server is written in rust.
|
- Server is written in rust.
|
||||||
- Front end is `~80kB` gzipped.
|
- Front end is `~80kB` gzipped.
|
||||||
|
@ -161,7 +162,7 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent
|
||||||
|
|
||||||
If you'd like to add translations, take a look a look at the [english translation file](ui/src/translations/en.ts).
|
If you'd like to add translations, take a look a look at the [english translation file](ui/src/translations/en.ts).
|
||||||
|
|
||||||
- Languages supported: English (`en`), Chinese (`zh`), French (`fr`), Swedish (`sv`), German (`de`), Russian (`ru`).
|
- Languages supported: English (`en`), Chinese (`zh`), French (`fr`), Spanish (`es`), Swedish (`sv`), German (`de`), Russian (`ru`).
|
||||||
|
|
||||||
## Credits
|
## Credits
|
||||||
|
|
||||||
|
|
2
docker/prod/docker-compose.yml
vendored
2
docker/prod/docker-compose.yml
vendored
|
@ -10,7 +10,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- lemmy_db:/var/lib/postgresql/data
|
- lemmy_db:/var/lib/postgresql/data
|
||||||
lemmy:
|
lemmy:
|
||||||
image: dessalines/lemmy:v0.0.7.3
|
image: dessalines/lemmy:v0.0.7.6
|
||||||
ports:
|
ports:
|
||||||
- "8536:8536"
|
- "8536:8536"
|
||||||
environment:
|
environment:
|
||||||
|
|
2
ui/src/version.ts
vendored
2
ui/src/version.ts
vendored
|
@ -1 +1 @@
|
||||||
export let version: string = "v0.0.7.3-0-g0baf079";
|
export let version: string = "v0.0.7.6-0-g20b53cc";
|
Loading…
Reference in a new issue