Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop ... # Conflicts: # cps/templates/readpdf.html # cps/translations/uk/LC_MESSAGES/messages.po # cps/web.py		2019-04-13 16:42:09 +02:00
..
images	Merge remote-tracking branch 'pdf.js/epubjs'	2019-04-13 15:02:01 +02:00
bar-ui.css	Merge remote-tracking branch 'audiobook/Branch_c27805b'	2019-01-27 11:14:38 +01:00
bootstrap-datepicker3.css.map
bootstrap-datepicker3.min.css	Update testing	2019-01-14 20:27:53 +01:00
bootstrap-editable.css
bootstrap-table.min.css
bootstrap-theme.min.css	update js and css libs, especially to fix xss in Jquery and Bootstrap	2019-02-10 18:17:33 +01:00
bootstrap-theme.min.css.map	update js and css libs, especially to fix xss in Jquery and Bootstrap	2019-02-10 18:17:33 +01:00
bootstrap.min.css	update js and css libs, especially to fix xss in Jquery and Bootstrap	2019-02-10 18:17:33 +01:00
bootstrap.min.css.map	update js and css libs, especially to fix xss in Jquery and Bootstrap	2019-02-10 18:17:33 +01:00
normalize.css	update js and css libs, especially to fix xss in Jquery and Bootstrap	2019-02-10 18:17:33 +01:00
typeahead.css
viewer.css	Merge remote-tracking branch 'pdf.js/epubjs'	2019-04-13 15:02:01 +02:00