diff options
| author | MaZderMind | 2016-12-18 13:34:57 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-18 13:34:57 +0100 |
| commit | a12d86ec058bc89e6feeda6ec8cfce691269b0a9 (patch) | |
| tree | 6be1f764a8addd025eb774bcd2039788a4b1873f /template/page.phtml | |
| parent | 521f0e2e1c94538fdce65a021144180f368364d9 (diff) | |
| parent | efd0b59f8ed363e12211894d8892e4d18b198c04 (diff) | |
Merge branch 'master' into events/33c3
Diffstat (limited to '')
| -rw-r--r-- | template/page.phtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/template/page.phtml b/template/page.phtml index b62f372..b3bad81 100644 --- a/template/page.phtml +++ b/template/page.phtml @@ -47,7 +47,7 @@ <link href="<?=h($assets)?>img/favicon.png" rel="icon" type="image/png" /> <link type="text/css" rel="stylesheet" href="<?=h($assets)?>mejs/mediaelementplayer.min.css" /> - <link type="text/css" rel="stylesheet" href="gen/main.css" /> + <link type="text/css" rel="stylesheet" href="<?=h($conference_assets)?>gen/main.css" /> <script type="text/javascript" src="<?=h($assets)?>js/lib/jquery.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>js/lib/jquery.scrollTo.min.js"></script> |