Commit Graph

2 Commits (f7d5480811c72c7e8104e79a39d08b9407ae3338)

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