Merge remote-tracking branch 'origin/andrei' into andrei

Browse Source

# Conflicts:
#	CineSync/static/css/timetable/session.css
#	CineSync/templates/timetable/session.html
#	CineSync/timetable/views.py

...

This commit is contained in:

Андрей Дувакин 2024-04-20 20:27:02 +05:00

parent 29f950c194 7d7afd64a7

commit afbc89709a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available