Merge branch 'master' into origin-weblate (0e72fcdc) · Commits · afi / opacce · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

opacce
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

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.

afi
opacce
Commits
0e72fcdc

Commit 0e72fcdc authored 8 years ago by

Laurent

Downloads
- Plain Diff

Merge branch 'master' into origin-weblate

Conflicts:
	library/translation/en.po

parents 04787d22 8048d718

Branches

Tags

2 merge requests!1866Hotline master,!1865Weblate

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

library/translation/en.mo 0 additions, 0 deletions

library/translation/en.mo
library/translation/en.po 583 additions, 159 deletions

library/translation/en.po
library/translation/es.mo 0 additions, 0 deletions

library/translation/es.mo
library/translation/es.po 445 additions, 17 deletions

library/translation/es.po
library/translation/fr.mo 0 additions, 0 deletions

library/translation/fr.mo
library/translation/fr.po 418 additions, 17 deletions

library/translation/fr.po
library/translation/fr.pot 400 additions, 2996 deletions

library/translation/fr.pot
library/translation/ro.mo 0 additions, 0 deletions

library/translation/ro.mo
library/translation/ro.po 444 additions, 17 deletions

library/translation/ro.po

with 2290 additions and 3206 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment