opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 -7
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e1f1a95a14 - Show all commits

3
app/templates/scolar/index.j2
View File

@ -83,7 +83,6 @@ table.semlist tbody tr td.modalite {
padding-right: 1em; padding-right: 1em;
} }
<<<<<<< HEAD
div.modalite { div.modalite {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
@ -148,8 +147,6 @@ span.effectif {
} }
=======
>>>>>>> b1055a4ebe841f17860d2556cc4b03aa12ec3ab1
</style> </style>
{# News #} {# News #}

4
sco_version.py
View File

@ -1,11 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
<<<<<<< HEAD
SCOVERSION = "9.6.955" SCOVERSION = "9.6.955"
=======
SCOVERSION = "9.6.954"
>>>>>>> b1055a4ebe841f17860d2556cc4b03aa12ec3ab1
SCONAME = "ScoDoc" SCONAME = "ScoDoc"