coop-cloud-chaos-patchs
/
calibre-web
0
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity
calibre-web/cps/static/css/images/icomoon/entypo-25px-ffffff/PNG
History
Ozzieisaacs 4708347c16 Merge branch 'Develop' 
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
 		2019-07-13 20:54:21 +02:00
..
arrow.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
cart.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
first.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
last.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
list.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
list2.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
loop.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
music.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
pause.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
play.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
shuffle.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
volume.png Merge branch 'Develop' 2019-07-13 20:54:21 +02:00