diff options
author | Adrian Rosin <adrian.rosin.etu@univ-lille.fr> | 2024-02-19 13:40:03 +0100 |
---|---|---|
committer | Tixie <hello.git.deuxfleurs@tixie.name> | 2024-06-07 18:11:09 +0000 |
commit | 469d165852c384b13302d3a29570078c71742eb1 (patch) | |
tree | 6e323ec0667b4ae274812c05c84178e4c416b58d /static/.well-known/chatonsinfos/cryptpad.properties | |
parent | 99b6eaae6174e6776c4e320abee7686b98afba70 (diff) | |
download | site-469d165852c384b13302d3a29570078c71742eb1.tar.gz site-469d165852c384b13302d3a29570078c71742eb1.zip |
Merge remote-tracking branch 'origin/feat/UnderlignedTitle'
# Conflicts:
# static/css/home.css
# static/css/layout.css
# static/index.html
Diffstat (limited to 'static/.well-known/chatonsinfos/cryptpad.properties')
0 files changed, 0 insertions, 0 deletions