mpeltriaux 4f482595c6 Merge branch 'master' into 138_New_map_client
# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po
2022-05-25 09:22:15 +02:00
..
2022-04-11 10:55:15 +02:00
2022-04-20 11:55:03 +02:00
2022-01-19 13:17:55 +01:00
2022-02-02 12:54:45 +01:00
2022-04-20 13:52:52 +02:00
2022-05-11 16:03:53 +02:00
2022-01-06 12:08:38 +01:00
2022-04-13 11:42:04 +02:00
2021-07-01 14:38:57 +02:00
2022-04-19 13:37:29 +02:00
2022-01-06 12:08:38 +01:00
2022-01-20 12:12:04 +01:00
2022-01-25 09:29:14 +01:00
2021-08-04 10:44:02 +02:00
2022-04-20 13:52:52 +02:00
2022-01-31 15:09:06 +01:00
2022-02-18 15:19:37 +01:00
2021-07-01 14:38:57 +02:00