diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-12-28 12:12:19 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-12-28 12:12:19 +0000 |
| commit | 607cac1947aaec9ab66de679615b4e14548027a8 (patch) | |
| tree | 3a3da119eb71a0536bd5f23226834dfea634d74a /mix.lock | |
| parent | b122b6ffa318af30586f9da0532135959804a6a0 (diff) | |
| parent | 3966add048fda791e6893540d8304b0e626ab9f4 (diff) | |
| download | pleroma-607cac1947aaec9ab66de679615b4e14548027a8.tar.gz | |
Merge branch 'revert-b122b6ff' into 'develop'
Revert "Merge branch 'features/hashtag-column' into 'develop'"
See merge request pleroma/pleroma!3222
Diffstat (limited to 'mix.lock')
0 files changed, 0 insertions, 0 deletions