Merge branch 'current-user-on-notifications-page' of tsia/halcyon into master
This commit is contained in:
commit
3805adbc8a
|
@ -2,6 +2,7 @@
|
||||||
<main id="main">
|
<main id="main">
|
||||||
<div class="article_wrap">
|
<div class="article_wrap">
|
||||||
<aside class="left_column">
|
<aside class="left_column">
|
||||||
|
<?php include dirname(__FILE__).('/widgets/side_current_user.php'); ?>
|
||||||
</aside>
|
</aside>
|
||||||
<article class="center_column">
|
<article class="center_column">
|
||||||
<header class="timeline_header">
|
<header class="timeline_header">
|
||||||
|
|
Loading…
Reference in New Issue