1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-02-15 14:03:03 +02:00
Ozzieisaacs 9fc0c3b3de Merge remote-tracking branch 'English_texts/master'
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
2020-02-23 13:27:44 +01:00
..
2020-02-23 13:15:30 +01:00
2020-02-23 13:22:57 +01:00
2020-02-01 13:40:29 +01:00
2020-02-23 13:15:30 +01:00
2020-02-15 16:02:31 +01:00
2020-02-23 09:08:01 +01:00
2020-02-15 10:21:45 +01:00
2020-02-23 09:08:01 +01:00
2020-02-23 09:08:01 +01:00
2020-02-17 18:42:53 +01:00
2020-02-22 16:24:06 +01:00
2020-02-23 09:08:01 +01:00
2020-02-17 18:42:53 +01:00
2020-02-23 09:08:01 +01:00