Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Resint
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Resint
Commits
b7977775
Commit
b7977775
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch 'trademark-hint' into 'master'
Add trademark hint to readme See merge request
!26
parents
55b0a4df
edd84ea5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!26
Add trademark hint to readme
Pipeline
#47943
failed
3 years ago
Stage: test
Stage: build
Stage: publish
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README.rst
+9
-1
9 additions, 1 deletion
README.rst
with
9 additions
and
1 deletion
README.rst
+
9
−
1
View file @
b7977775
...
@@ -4,7 +4,7 @@ AlekSIS (School Information System) — App Resint (Public poster)
...
@@ -4,7 +4,7 @@ AlekSIS (School Information System) — App Resint (Public poster)
AlekSIS
AlekSIS
-------
-------
This is an application for use with the `AlekSIS`_ platform.
This is an application for use with the `AlekSIS
®
`_ platform.
Features
Features
--------
--------
...
@@ -31,5 +31,13 @@ full licence text or on the `European Union Public Licence`_ website
...
@@ -31,5 +31,13 @@ full licence text or on the `European Union Public Licence`_ website
https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers
https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers
(including all other official language versions).
(including all other official language versions).
Trademark
---------
AlekSIS® is a registered trademark of the AlekSIS open source project, represented
by Teckids e.V. Please refer to the `trademark policy`_ for hints on using the trademark
AlekSIS®.
.. _AlekSIS: https://edugit.org/AlekSIS/official/AlekSIS
.. _AlekSIS: https://edugit.org/AlekSIS/official/AlekSIS
.. _European Union Public Licence: https://eupl.eu/
.. _European Union Public Licence: https://eupl.eu/
.. _trademark policy: https://aleksis.org/pages/about
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment