diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-07-15 19:21:01 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-07-15 19:21:01 +0000 |
| commit | bfc6f7b3ec7e0b77851d95a289e10e22e05fc75f (patch) | |
| tree | a7ab478cec884327107bf8f4fdfc0c3c6863412d /src/components/conversation/conversation.js | |
| parent | c649e202b355e32c744bfc4ef802f3bc64635d9d (diff) | |
| parent | 114a36c9be0e36ffdc5f3b14adc7e48381876b6e (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/conversation/conversation.js')
0 files changed, 0 insertions, 0 deletions