Skip to content
Snippets Groups Projects

get all the new changes from master into the branch

Closed get all the new changes from master into the branch
master into upgrade-to-django-4
Closed Nico Vermaas requested to merge master into upgrade-to-django-4
Compare
and
29 files
+ 519
− 58
Compare changes
  • Side-by-side
  • Inline
Files
29
atdb/atdb/settings/dev.py
+ 1
− 1
@@ -13,7 +13,7 @@ DATABASES = {
@@ -13,7 +13,7 @@ DATABASES = {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'USER': 'atdb_admin',
'USER': 'atdb_admin',
'PASSWORD': 'atdb123',
'PASSWORD': 'atdb123',
'NAME': 'atdb_ldv_20nov2023',
'NAME': 'atdb_ldv_12jan2024',
'HOST': 'localhost',
'HOST': 'localhost',
'PORT': '5432',
'PORT': '5432',
},
},