mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-05 04:00:02 +00:00
Merge branch 'master' of https://github.com/dessalines/lemmy into nocross-nomusl
This commit is contained in:
commit
2642215a80
3 changed files with 2 additions and 3 deletions
2
docker/prod/docker-compose.yml
vendored
2
docker/prod/docker-compose.yml
vendored
|
@ -10,7 +10,7 @@ services:
|
|||
volumes:
|
||||
- lemmy_db:/var/lib/postgresql/data
|
||||
lemmy:
|
||||
image: dessalines/lemmy:v0.1.0
|
||||
image: dessalines/lemmy:v0.1.0.3
|
||||
ports:
|
||||
- "8536:8536"
|
||||
environment:
|
||||
|
|
1
ui/src/components/main.tsx
vendored
1
ui/src/components/main.tsx
vendored
|
@ -107,7 +107,6 @@ export class Main extends Component<any, MainState> {
|
|||
// Necessary for back button for some reason
|
||||
componentWillReceiveProps(nextProps: any) {
|
||||
if (nextProps.history.action == 'POP' || nextProps.history.action == 'PUSH') {
|
||||
this.state = this.emptyState;
|
||||
this.state.type_ = this.getListingTypeFromProps(nextProps);
|
||||
this.state.sort = this.getSortTypeFromProps(nextProps);
|
||||
this.state.page = this.getPageFromProps(nextProps);
|
||||
|
|
2
ui/src/version.ts
vendored
2
ui/src/version.ts
vendored
|
@ -1 +1 @@
|
|||
export let version: string = "v0.1.0-0-g5b91b7b";
|
||||
export let version: string = "v0.1.0.3-0-gfd8928a";
|
Loading…
Reference in a new issue