Merge remote-tracking branch 'upstream/master'
Conflicts:
tests/Framework/Washtml.php
Description
Description
Details
Details
- Provenance
machniak Authored on Jul 31 2016, 7:26 AM mollekopf Pushed on Aug 21 2023, 3:06 PM - Parents
- R3:30668879b076: Use SymLinksIfOwnerMatch in .htaccess instead of FollowSymLinks disabled on…
R3:6737e293bbfd: Wash position:fixed style in HTML mail for better security (#5264) - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- a576ca266418 Update changelogAuthor
- 90a6d717ec92 Require PHP >= 5.4Author
- 276ad83fc78b Update managesieve changelogAuthor
- ec1525a1e6f8 Remove debug codeAuthor
- 40a493b0e102 Adjusting csv2vcard.inc fileAuthorClaudio Ferreira Filho
- 51979cb5541c Adding localized in pt_BR csv2vcard.inc fileAuthorClaudio Ferreira Filho
- d5788494a88b Update changelogAuthor
- 354042c4f400 Fix German tranlsation for 'open' (#5360)AuthorThomas Bruederli
- 9fe5b88deeb0 Add new translations for Enigma pluginAuthorThomas Bruederli
- 4e3442877dc9 Updated localizations from TransifexAuthorThomas Bruederli
- cde1fbde0cfd Fix typosAuthorMichał Wojciechowski
- e6553ce60d0e Fix German localization labelAuthor
- 23a27cc61e78 Merge branch 'pulcov-master'Author
- 6ee0cec8e97d optimize png images using zopflipngAuthorPeter Dave Hello
