Commit 6c75b7d7 authored by Jonathan Weth's avatar Jonathan Weth

Merge

parents 6e04fb58 d477b2bf
......@@ -65,7 +65,7 @@ Minor changes
* Use bootstrap buttons everywhere
_`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Chronos/-/tags/1.0a1
_`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Chronos/-/tags/1.0a2
_`1.0a3`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Chronos/-/tags/1.0a3
_`2.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-Chronos/-/tags/2.0a1
_`1.0a1`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a1
_`1.0a2`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a2
_`1.0a3`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a3
_`2.0a1`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0a1
......@@ -29,5 +29,5 @@ 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).
.. _AlekSIS: https://edugit.org/AlekSIS/AlekSIS
.. _AlekSIS: https://edugit.org/AlekSIS/Official/AlekSIS
.. _European Union Public Licence: https://eupl.eu/
......@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0005_add_verbose_names_meta'),
('core', '0008_rename_fields_notification_activity'),
('chronos', '0004_room_name_not_unique'),
]
......
This diff is collapsed.
......@@ -11,7 +11,7 @@ description = "AlekSIS (School Information System) — App Χρόνος (dig
authors = ["Dominik George <dominik.george@teckids.org>", "Julian Leucker <leuckeju@katharineum.de>", "Frank Poetzsch-Heffter <p-h@katharineum.de>", "Tom Teichler <tom.teichler@teckids.org>", "Jonathan Weth <wethjo@katharineum.de>", "Hangzhi Yu <yuha@katharineum.de>"]
license = "EUPL-1.2"
homepage = "https://aleksis.edugit.io/"
repository = "https://edugit.org/AlekSIS/AlekSIS-App-Chronos"
repository = "https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos"
documentation = "https://aleksis.edugit.io/AlekSIS/docs/html/"
classifiers = [
"Environment :: Web Environment",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment