Michael Mayer 2186b923c9 Merge remote-tracking branch 'origin/develop' into feature/oidc-v2 ... # Conflicts: # docker-compose.mariadb.yml # docker-compose.yml # frontend/src/component/navigation.vue # frontend/src/pages/albums.vue # frontend/tests/acceptance/settings/general.js # go.mod # go.sum # internal/commands/users.go # internal/config/flags.go # internal/config/options.go # internal/entity/user.go # scripts/build.sh # scripts/docker/arch.sh # scripts/sql/init-test-databases.sql		2021-12-18 11:57:44 +01:00
..
capture
clusters
colors
fastwalk
fs	Config: Search /opt/photoprism for assets and media files #1821	2021-12-17 11:30:49 +01:00
geo
pluscode
rnd	Merge remote-tracking branch 'origin/develop' into feature/oidc-v2	2021-12-18 11:57:44 +01:00
s2
sanitize
txt