Commit Graph

2 Commits (a6931b4936152fa1b5f2f2428903efa341614a97)

Author SHA1 Message Date
Ozzie Isaacs 2ba14acf4f Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
7 months ago
Ozzie Isaacs ff9e1ed7c8 Implemented embed metadata on send to ereader 7 months ago