Michel Heusschen 0e00805187 resolve merge conflict

2023-02-12 06:15:27 +01:00

..

background_service

feat(.well-known): add .well-known/immich to reference API endpoint (#1308)

2023-01-19 09:45:37 -06:00

models

feat(mobile): configurable background backup delay (#1068)

2022-12-08 09:51:36 -06:00

providers

feat(mobile): configurable background backup delay (#1068)

2022-12-08 09:51:36 -06:00

services

refactor(mobile): reworked Asset, store all required fields from local & remote (#1539)

2023-02-04 14:42:42 -06:00

ui

feat(mobile): show current upload asset (#1399)

2023-01-23 17:10:21 -06:00

views

resolve merge conflict

2023-02-12 06:15:27 +01:00