Dev merged with master to resolve merge conflicts.

CRIM-Project / CRIM-online

Django project for CRIM (Citations: The Renaissance Imitation Mass)

6 stars 4 forks source link

Dev merged with master to resolve merge conflicts. #63

Closed serberoth closed 2 years ago

serberoth commented 2 years ago

Dev merged with master to resolve merge conflicts.

Please ensure that you pull down dev to your local environment. In addition please merge dev into any working local branch or create a new working branch once you have pulled dev to avoid this sort of thing in the future.