Merge branch 'master' into develop

# Conflicts: # .gitignore # cps/web.py
2017-03-06 19:17:00 +00:00
parent 27cbab6cb7 789a1af68f
commit fabfcb2036
10 changed files with 15539 additions and 23186 deletions
@@ -247,7 +247,7 @@ class Books(Base):
    identifiers = relationship('Identifiers', backref='books')

    def __init__(self, title, sort, author_sort, timestamp, pubdate, series_index, last_modified, path, has_cover,
-                 authors, tags):
+                 authors, tags, languages = None):
        self.title = title
        self.sort = sort
        self.author_sort = author_sort