Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history 
# Conflicts:
#	pytransit/models/numba/qpower2_nb.py
  • Loading branch information
@hpparvi
hpparvi committed Jul 1, 2020
2 parents 7415012 + 59872d7 commit a555f44
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit a555f44

Please sign in to comment.