-
Albert Astals Cid authored
Conflicts: poppler/CairoOutputDev.cc poppler/CairoOutputDev.h poppler/FontInfo.cc poppler/GfxFont.cc poppler/GfxState.cc poppler/GlobalParams.cc poppler/GlobalParams.h poppler/Lexer.cc
ea6bc195
GitLab will be down for maintenance Monday June 03, from approx 10am UTC for roughly 48 hours. This is for a major gitlab upgrade which requires a DB migration. See the tracker issue for more informations.
Conflicts: poppler/CairoOutputDev.cc poppler/CairoOutputDev.h poppler/FontInfo.cc poppler/GfxFont.cc poppler/GfxState.cc poppler/GlobalParams.cc poppler/GlobalParams.h poppler/Lexer.cc