aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/app.module.ts
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
commitfada8d75550dc7365f7e18ee1569b9406251d660 (patch)
treedb9dc01c18693824f83fce5020f4c1f3ae7c0865 /client/src/app/app.module.ts
parent492fd28167f770d79a430fc57451b5a9e075d8e7 (diff)
parentc2830fa8f84f61462098bf36add824f89436dfa9 (diff)
downloadPeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip
Merge branch 'feature/design' into develop
Diffstat (limited to 'client/src/app/app.module.ts')
-rw-r--r--client/src/app/app.module.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index e71641e0d..1326e3411 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -20,6 +20,8 @@ import { LoginModule } from './login'
20import { SignupModule } from './signup' 20import { SignupModule } from './signup'
21import { SharedModule } from './shared' 21import { SharedModule } from './shared'
22import { VideosModule } from './videos' 22import { VideosModule } from './videos'
23import { MenuComponent } from './menu'
24import { HeaderComponent } from './header'
23 25
24export function metaFactory (): MetaLoader { 26export function metaFactory (): MetaLoader {
25 return new MetaStaticLoader({ 27 return new MetaStaticLoader({
@@ -47,7 +49,10 @@ const APP_PROVIDERS = [
47@NgModule({ 49@NgModule({
48 bootstrap: [ AppComponent ], 50 bootstrap: [ AppComponent ],
49 declarations: [ 51 declarations: [
50 AppComponent 52 AppComponent,
53
54 MenuComponent,
55 HeaderComponent
51 ], 56 ],
52 imports: [ 57 imports: [
53 BrowserModule, 58 BrowserModule,