1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-01-23 16:41:20 +00:00
Yohann D'ANELLO 841d56d5b3 Merge remote-tracking branch 'origin/master' into activity
# Conflicts:
#	note_kfet/urls.py
#	templates/base.html
2020-03-27 00:32:22 +01:00
..
2020-03-22 16:04:09 +01:00
2020-03-20 02:20:13 +01:00
2020-03-25 16:58:15 +01:00
2020-03-26 15:59:51 +01:00
2020-03-23 15:28:09 +01:00