Merge branch 'master' of https://git.xpub.nl/repos/xpub-lib

app/templates/show_books.html

@@ -20,27 +20,21 @@
         <th>Cover</th>
       <th>Title</th>
       <th>Author</th>
-<<<<<<< HEAD
       <th>Filetype</th>
-=======
       <th>Tag</th>
->>>>>>> 18f7acebcd760ab12a86ada4423cbefcbdaafdf5
     </tr>
         {% for book in books %}
     <tr>
       <td><img src="../uploads/cover/{{ book.cover }}" width="80"></td>
       <td><a href="books/{{ book.id }}">{{ book.title }}</a></td>
-<<<<<<< HEAD
+
       <td>  {% for author in book.author %}
 
               <li>  {{ author.author_name }}</li>
 
         {% endfor %}</td>
       <td>{{ book.fileformat }}</td>
-=======
-      <td>{{ book.author }}</td>
       <td>{{ book.tag}}</td>
->>>>>>> 18f7acebcd760ab12a86ada4423cbefcbdaafdf5
     </tr>
   {% endfor %}
   </table>

requirements.txt

@@ -14,5 +14,6 @@ SQLAlchemy==1.1.5
 Werkzeug==0.11.15
 WTForms==2.1
 flask-marshmallow==0.9.0
-
+Wand==0.4.4
+PyPDF2==1.26.0