aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_panel/user_panel.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-07-15 19:21:01 +0000
committerShpuld Shpludson <shp@cock.li>2019-07-15 19:21:01 +0000
commitbfc6f7b3ec7e0b77851d95a289e10e22e05fc75f (patch)
treea7ab478cec884327107bf8f4fdfc0c3c6863412d /src/components/user_panel/user_panel.vue
parentc649e202b355e32c744bfc4ef802f3bc64635d9d (diff)
parent114a36c9be0e36ffdc5f3b14adc7e48381876b6e (diff)
Merge branch 'revert-0a7c60c3' into 'develop'
Revert "Merge branch 'csp-header' into 'develop'" See merge request pleroma/pleroma-fe!880
Diffstat (limited to 'src/components/user_panel/user_panel.vue')
0 files changed, 0 insertions, 0 deletions