Merge branch 'revert-b122b6ff' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 28 Dec 2020 12:12:19 +0000 (12:12 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 28 Dec 2020 12:12:19 +0000 (12:12 +0000)
commit607cac1947aaec9ab66de679615b4e14548027a8
tree3a3da119eb71a0536bd5f23226834dfea634d74a
parentb122b6ffa318af30586f9da0532135959804a6a0
parent3966add048fda791e6893540d8304b0e626ab9f4
Merge branch 'revert-b122b6ff' into 'develop'

Revert "Merge branch 'features/hashtag-column' into 'develop'"

See merge request pleroma/pleroma!3222