Merge branch 'master' into dev

This commit is contained in:
Dessalines 2020-01-04 17:22:59 -05:00
commit 8c4e973409
3 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@ services:
- lemmy_db:/var/lib/postgresql/data
restart: always
lemmy:
image: dessalines/lemmy:v0.5.15
image: dessalines/lemmy:v0.5.16
ports:
- "127.0.0.1:8536:8536"
restart: always

View File

@ -1 +1 @@
pub const VERSION: &str = "v0.5.15";
pub const VERSION: &str = "v0.5.16";

2
ui/src/version.ts vendored
View File

@ -1 +1 @@
export let version: string = 'v0.5.15';
export let version: string = 'v0.5.16';