diff options
author | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 20:54:03 +1000 |
---|---|---|
committer | Gerhard Weis <g.weis@griffith.edu.au> | 2017-07-05 20:54:03 +1000 |
commit | 0d0abd79a975ed132a8eb43783f87cd84eea9267 (patch) | |
tree | 733231867f0ff1ba3679e1d4564a1b2506353cb2 /setup.cfg | |
parent | 1dc3c2481ba32e9dbcad9e55d2c20281f5aa5756 (diff) | |
parent | 6e5802bf7b410551f1dfcaf6ede8638f0f233cad (diff) | |
download | isodate-0d0abd79a975ed132a8eb43783f87cd84eea9267.tar.gz |
Merge branch 'master' of https://github.com/lmazuel/isodate
# Conflicts:
# .travis.yml
# setup.cfg
# src/isodate/tzinfo.py
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions