1
0
mirror of https://github.com/janeczku/calibre-web synced 2025-12-09 01:38:05 +00:00

Merge branch 'janeczku-master'

# Conflicts:
#	cps/helper.py
#	cps/tasks/convert.py
#	cps/templates/user_edit.html
This commit is contained in:
gjutras
2022-07-08 16:42:14 -04:00
3 changed files with 30 additions and 23 deletions

View File

@@ -25,7 +25,7 @@
</div>
{% endif %}
<div class="form-group">
<label for="kindle_mail">{{_('Send to E-Reader E-mail Address')}}</label>
<label for="kindle_mail">{{_('Send to E-Reader E-mail Address. Use comma to seperate emails for multiple E-Readers.')}}</label>
<input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
</div>
{% if not content.role_anonymous() %}