Commit Graph

1 Commits (d45b1b8ea5cbc1252a06213c4f655659fb56f15e)

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