Merge branch 'master' into dev

This commit is contained in:
Dessalines 2020-01-20 11:10:00 -05:00
commit 7145dde79f
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.6.1
image: dessalines/lemmy:v0.6.2
ports:
- "127.0.0.1:8536:8536"
restart: always

View file

@ -1 +1 @@
pub const VERSION: &str = "v0.6.1";
pub const VERSION: &str = "v0.6.2-2-g6312ff3";

2
ui/src/version.ts vendored
View file

@ -1 +1 @@
export let version: string = 'v0.6.1';
export let version: string = 'v0.6.2-2-g6312ff3';