Merge with master (!4) · Merge requests · Benjamin Tobias Pritikin / 119b Git Game · GitLab

Snippets Groups Projects

Merged Alex Watson requested to merge dev into master 3 years ago

Jan 13, 2022
- Update PacificMap.py · 54ad10bd
  Alex Watson authored 3 years ago
  
  54ad10bd
- Merge branch 'master' into 'dev' · 04a24d1f
  Benjamin Tobias Pritikin authored 3 years ago
  
  # Conflicts: # PacificMap.py
  04a24d1f
- Added Auckland NZ location, changed map title · aff103d8
  Alex Watson authored 3 years ago
  
  aff103d8
- Updated PacificMap.py, Map shows the Pacific ocean as well as locations for Santa Cruz and Honolulu · 4e53cf57
  Alex Watson authored 3 years ago
  
  4e53cf57