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
..
icomoon	Merge remote-tracking branch 'audiobook/Branch_c27805b'	2019-01-27 11:14:38 +01:00
patterns	Merge remote-tracking branch 'audiobook/Branch_c27805b'	2019-01-27 11:14:38 +01:00
black-10.png	Merge remote-tracking branch 'audiobook/Branch_c27805b'	2019-01-27 11:14:38 +01:00
black-25.png	Merge remote-tracking branch 'audiobook/Branch_c27805b'	2019-01-27 11:14:38 +01:00
black-33.png	Merge remote-tracking branch 'audiobook/Branch_c27805b'	2019-01-27 11:14:38 +01:00