Merge branch 'next-minor' into develop

This commit is contained in:
Benjamin Neff 2021-07-26 02:37:40 +02:00
commit d02848c216
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 2 additions and 2 deletions

View file

@ -44,7 +44,7 @@ jobs:
- 5432:5432
steps:
- name: Install system dependencies
run: sudo apt-get install -y build-essential curl git gsfonts imagemagick libcurl4-openssl-dev libidn11-dev libmagickwand-dev libssl-dev libxml2-dev libxslt1-dev
run: sudo apt update && sudo apt install -y build-essential curl git gsfonts imagemagick libcurl4-openssl-dev libidn11-dev libmagickwand-dev libssl-dev libxml2-dev libxslt1-dev
- name: Start MySQL
run: sudo systemctl start mysql.service
if: matrix.db == 'mysql'

View file

@ -42,6 +42,7 @@ Although the chat was never enabled per default and was marked as experimental,
* Cache local posts/comments count for statistics [#8241](https://github.com/diaspora/diaspora/pull/8241)
* Fix html-syntax in some handlebars templates [#8251](https://github.com/diaspora/diaspora/pull/8251)
* Remove `chat_enabled` flag from archive export [#8265](https://github.com/diaspora/diaspora/pull/8265)
* Change thumbnails in image slideshow to squares [#8275](https://github.com/diaspora/diaspora/pull/8275)
## Bug fixes

View file

@ -55,7 +55,6 @@ $margin: 15px;
li {
border: 0;
border-radius: $thumbnail-size / 2;
height: $thumbnail-size;
margin: $margin 6px;
vertical-align: middle;