Merge remote-tracking branch 'Convert_all/ebookconvert-any'

# Conflicts: # cps/web.py
2018-08-31 15:00:22 +02:00
parent 3f35200a0b 22ecdfd2bc
commit 4a95404e17
21 changed files with 4217 additions and 2357 deletions
@@ -5,7 +5,7 @@
  <table class="table table-striped" id="table_user">
    <tr>
        <th>{{_('Nickname')}}</th>
-        <th>{{_('Email')}}</th>
+        <th>{{_('E-mail')}}</th>
        <th>{{_('Kindle')}}</th>
        <th>{{_('DLS')}}</th>
        <th class="hidden-xs">{{_('Admin')}}</th>