Merge branch... (bd66235b) · Commits · afi / opacce · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit bd66235b authored 10 years ago by

Patrick Barroca

Merge branch...

Merge branch 'hotline_#17191_fix_sito_html_img_if_bluga_disabled_and_no_local_img' into 'hotline_6.54'

Hotline #17191 fix sito html img if bluga disabled and no local img

See merge request !474

parents a5d66148 deae708d

Branches

Tags

4 merge requests!529Hotline 6.56,!512Master,!484Master,!483Hotline 6.54

Hide whitespace changes

Inline Side-by-side

Showing with 61 additions and 22 deletions

Please register or to comment