Merge branch 'master' into dev

5 years ago · 7aa801b111
parent 9c99234e8b ebc61bf936
commit 7aa801b111
3 changed files with 3 additions and 3 deletions
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@ -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
--- a/server/src/version.rs
+++ b/server/src/version.rs
@ -1 +1 @@
-pub const VERSION: &str = "v0.6.1";
+pub const VERSION: &str = "v0.6.2-2-g6312ff3";
--- a/ui/src/version.ts
+++ b/ui/src/version.ts
@ -1 +1 @@
-export let version: string = 'v0.6.1';
+export let version: string = 'v0.6.2-2-g6312ff3';