Commit Graph

1 Commits (4fecce0a0d555a1f90ad7652b2c2200b688818f8)

Author SHA1 Message Date
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
6 years ago