Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

Admin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

dc4f5d6c

Unverified Commit dc4f5d6c authored 1 year ago by Arnaud Levy Committed by GitHub 1 year ago

Downloads
- Plain Diff

Merge branch 'main' into libre-translate

parents e23a5365 1c986f68

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/models/communication/block/template/agenda.rb 1 addition, 0 deletions

app/models/communication/block/template/agenda.rb
app/views/admin/communication/blocks/templates/agenda/_edit.html.erb 1 addition, 0 deletions

...dmin/communication/blocks/templates/agenda/_edit.html.erb
app/views/admin/communication/blocks/templates/agenda/_show.html.erb 3 additions, 0 deletions

...dmin/communication/blocks/templates/agenda/_show.html.erb
app/views/admin/communication/blocks/templates/agenda/_static.html.erb 4 additions, 4 deletions

...in/communication/blocks/templates/agenda/_static.html.erb
config/locales/communication/contents/en.yml 3 additions, 0 deletions

config/locales/communication/contents/en.yml
config/locales/communication/contents/fr.yml 3 additions, 0 deletions

config/locales/communication/contents/fr.yml

with 15 additions and 4 deletions

Loading

0% Loading 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