Michał Najborowski 76cceaaec2 Merge remote-tracking branch 'origin/master' into RANDOMSEC-19 ... # Conflicts: # Serwer_django/config/settings.py # Serwer_django/config/urls.py # Serwer_django/db.sqlite3 # Serwer_django/templates/base.html # Serwer_django/templates/home.html # Serwer_django/templates/registration/login.html		2022-01-23 22:35:07 +01:00
..
images	Merge remote-tracking branch 'origin/master' into RANDOMSEC-19	2022-01-23 22:35:07 +01:00
base.css	add static files	2022-01-23 22:34:29 +01:00