Merge branch 'master' into dev

This commit is contained in:
Dessalines 2019-09-04 12:54:28 -07:00
commit 6cd93ef990
2 changed files with 2 additions and 2 deletions

View file

@ -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.9.5 image: dessalines/lemmy:v0.0.9.7
ports: ports:
- "8536:8536" - "8536:8536"
environment: environment:

2
ui/src/version.ts vendored
View file

@ -1 +1 @@
export let version: string = "v0.0.9.5-0-g7f8f451"; export let version: string = "v0.0.9.7-0-g7b4ea6e";