Skip to content
Snippets Groups Projects
Commit f544c28b authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'trademark-hint' into 'master'

Add trademark hint to readme

See merge request !99
parents 183de825 d5eb87b8
No related branches found
No related tags found
1 merge request!99Add trademark hint to readme
Pipeline #44071 passed with warnings
Pipeline: AlekSIS

#44085

    ......@@ -4,7 +4,7 @@ AlekSIS (School Information System) — App Hjelp (FAQ and support)
    AlekSIS
    -------
    This is an application for use with the `AlekSIS`_ platform.
    This is an application for use with the `AlekSIS®`_ platform.
    Features
    --------
    ......@@ -33,5 +33,13 @@ full licence text or on the `European Union Public Licence`_ website
    https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers
    (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://aleksis.org/
    .. _European Union Public Licence: https://eupl.eu/
    .. _trademark policy: https://aleksis.org/pages/about
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment