diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-11-09 17:38:45 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-11-09 17:38:45 +0000 |
| commit | c873a18c64c995721e62399428205c451f8b4758 (patch) | |
| tree | 106417c3e17c7e38c6e0ed47bc7b8bd506a624be /src/components/about/about.vue | |
| parent | 044c9ad0562af059dd961d50961a3880fca9c642 (diff) | |
| parent | a2a94c4b7b33611d97c61761de0cef85eb892bb1 (diff) | |
Merge branch 'feature/about-page' into 'develop'
Feature/about page
Closes #699
See merge request pleroma/pleroma-fe!985
Diffstat (limited to 'src/components/about/about.vue')
| -rw-r--r-- | src/components/about/about.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/about/about.vue b/src/components/about/about.vue index 62ae16ea..518f6184 100644 --- a/src/components/about/about.vue +++ b/src/components/about/about.vue @@ -1,8 +1,10 @@ <template> <div class="sidebar"> - <instance-specific-panel /> - <features-panel v-if="showFeaturesPanel" /> + <instance-specific-panel v-if="showInstanceSpecificPanel" /> + <staff-panel /> <terms-of-service-panel /> + <MRFTransparencyPanel /> + <features-panel v-if="showFeaturesPanel" /> </div> </template> |