diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
| commit | f3a4d57be14b40d1e3a6ad9e1a1f9337dafc872e (patch) | |
| tree | 623c4b710fed94a7280587da7d66863ab489957c /Aptfile | |
| parent | 3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (diff) | |
| parent | f847f67410c75036edb2c4b45d0db048af0481c9 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
Diffstat (limited to 'Aptfile')
| -rw-r--r-- | Aptfile | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/Aptfile b/Aptfile index a52eef4e1..8f5bb72a2 100644 --- a/Aptfile +++ b/Aptfile @@ -1,26 +1,4 @@ ffmpeg -libicu[0-9][0-9] -libicu-dev -libidn12 -libidn-dev libpq-dev libxdamage1 libxfixes3 -zlib1g-dev -libcairo2 -libcroco3 -libdatrie1 -libgdk-pixbuf2.0-0 -libgraphite2-3 -libharfbuzz0b -libpango-1.0-0 -libpangocairo-1.0-0 -libpangoft2-1.0-0 -libpixman-1-0 -librsvg2-2 -libthai-data -libthai0 -libvpx[5-9] -libxcb-render0 -libxcb-shm0 -libxrender1 |