Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
4 changed files with 4 additions and 4 deletions
Showing only changes of commit 155b99b64e - Show all commits

2
ansible/VERSION vendored
View File

@ -1 +1 @@
v0.6.59
v0.6.60

View File

@ -12,7 +12,7 @@ services:
restart: always
lemmy:
image: dessalines/lemmy:v0.6.59
image: dessalines/lemmy:v0.6.60
ports:
- "127.0.0.1:8536:8536"
restart: always

View File

@ -1 +1 @@
pub const VERSION: &str = "v0.6.59";
pub const VERSION: &str = "v0.6.60";

2
ui/src/version.ts vendored
View File

@ -1 +1 @@
export const version: string = 'v0.6.59';
export const version: string = 'v0.6.60';