Commit Graph

2 Commits (05da2ae3c757a10208e6321cfef578e4c2edabc3)

Author SHA1 Message Date
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
6 years ago