Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ng6
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

Admin message

Mise à jour de sécurité terminée. Gitlab est en version 17.9.7

d03652bf

Commit d03652bf authored 4 years ago by Romain Therville

Downloads
- Plain Diff

Merge branch 'master' into 'issue#195'

# Conflicts:
#   ui/nG6/pi6/class.tx_nG6_pi6.php

parents 9c73b74d 1881ae7b

No related branches found

No related tags found

1 merge request!115Merge branch issue#195 with master

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

bin/ng6_database.sql 27 additions, 0 deletions

bin/ng6_database.sql
src/jflow/config_reader.py 1 addition, 1 deletion

src/jflow/config_reader.py
src/jflow/server.py 1 addition, 1 deletion

src/jflow/server.py
src/ng6/utils.py 1 addition, 0 deletions

src/ng6/utils.py
ui/nG6/lib/class.tx_nG6_db.php 15 additions, 12 deletions

ui/nG6/lib/class.tx_nG6_db.php
ui/nG6/lib/class.tx_nG6_utils.php 21 additions, 0 deletions

ui/nG6/lib/class.tx_nG6_utils.php
ui/nG6/pi6/class.tx_nG6_pi6.php 38 additions, 13 deletions

ui/nG6/pi6/class.tx_nG6_pi6.php

with 104 additions and 27 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