aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/app-routing.module.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-08-25 11:42:30 +0200
committerChocobozzz <me@florianbigard.com>2021-08-25 11:42:30 +0200
commitfdec51e3846d50e3375612a6820ed3ab0b5fcd25 (patch)
tree17283e85a6794c9e8fe3f5d4478a406d8d188425 /client/src/app/app-routing.module.ts
parent59c8902a57991be29f0aacac1642389fb770c6ed (diff)
parentdd24f1bb0a4b252e5342b251ba36853364da7b8e (diff)
downloadPeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.tar.gz
PeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.tar.zst
PeerTube-fdec51e3846d50e3375612a6820ed3ab0b5fcd25.zip
Merge branch 'feature/video-filters' into develop
Diffstat (limited to 'client/src/app/app-routing.module.ts')
-rw-r--r--client/src/app/app-routing.module.ts1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 1f98e9d2e..438cb6512 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -177,6 +177,7 @@ routes.push({
177 imports: [ 177 imports: [
178 RouterModule.forRoot(routes, { 178 RouterModule.forRoot(routes, {
179 useHash: Boolean(history.pushState) === false, 179 useHash: Boolean(history.pushState) === false,
180 // Redefined in app component
180 scrollPositionRestoration: 'disabled', 181 scrollPositionRestoration: 'disabled',
181 preloadingStrategy: PreloadSelectedModulesList, 182 preloadingStrategy: PreloadSelectedModulesList,
182 anchorScrolling: 'disabled' 183 anchorScrolling: 'disabled'