Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

CMS
- Activity
- Members
- Labels

Snippets Groups Projects

MO-P
CMS
Commits
0f333cae

Commit 0f333cae authored Sep 25, 2024 by Martin Mareš

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master'

parents 31e935e3 f0d969b4

Branches

No related tags found

No related merge requests found

Changes 13

Expand all Show whitespace changes

Inline Side-by-side

Showing

.github/workflows/main.yml 2 additions, 2 deletions

.github/workflows/main.yml
.vscode/extensions.json 7 additions, 2 deletions

.vscode/extensions.json
.vscode/settings.json 21 additions, 1 deletion

.vscode/settings.json
Dockerfile 1 addition, 1 deletion

Dockerfile
cms/io/service.py 1 addition, 0 deletions

cms/io/service.py
cms/locale/et/LC_MESSAGES/cms.po 510 additions, 456 deletions

cms/locale/et/LC_MESSAGES/cms.po
cms/locale/ru/LC_MESSAGES/cms.po 138 additions, 117 deletions

cms/locale/ru/LC_MESSAGES/cms.po
cms/server/contest/templates/contest.html 1 addition, 1 deletion

cms/server/contest/templates/contest.html
cmsranking/RankingWebServer.py 5 additions, 0 deletions

cmsranking/RankingWebServer.py
cmstestsuite/code/oom-heap.c 3 additions, 1 deletion

cmstestsuite/code/oom-heap.c
docker-compose.test.yml 8 additions, 10 deletions

docker-compose.test.yml
docs/Docker image.rst 33 additions, 9 deletions

docs/Docker image.rst
requirements.txt 3 additions, 4 deletions

requirements.txt

with 733 additions and 604 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please sign in to comment