SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py · cc53437898421fe6c7423d0a9314d1429d9bcdc7 · RadioObservatory / LOFAR

5 years ago

Merge remote-tracking branch 'remotes/origin/master' into · a43eb857

Roy de Goei authored 5 years ago

# Conflicts:
#	SAS/TMSS/src/tmss/tmssapp/migrations/0002_populate.py
#	SAS/TMSS/src/tmss/tmssapp/populate.py
#	SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py
#	SAS/TMSS/test/tmss_test_data_django_models.py

a43eb857

History

Merge remote-tracking branch 'remotes/origin/master' into

Roy de Goei authored 5 years ago

# Conflicts:
#	SAS/TMSS/src/tmss/tmssapp/migrations/0002_populate.py
#	SAS/TMSS/src/tmss/tmssapp/populate.py
#	SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py
#	SAS/TMSS/test/tmss_test_data_django_models.py

Code owners

Assign users and groups as approvers for specific file changes. Learn more.