Merge branch 'develop' into feature/lockdown-timelines-private-mode

This commit is contained in:
Mark Felder 2019-12-12 13:32:52 -06:00
commit 821a2bcc68
65 changed files with 659 additions and 1179 deletions

View file

@ -31,6 +31,7 @@
</div>
<div class="item">
<router-link
v-if="!hideSitename"
class="site-name"
:to="{ name: 'root' }"
active-class="home"