1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-05 02:39:47 +02:00
ampache/server
John Moore f4d7b64fd0 Merge branch 'master' of https://github.com/ampache-doped/ampache
Conflicts:
	lib/class/ajax.class.php
	lib/general.lib.php
	themes/fresh/templates/default.css
2013-11-19 19:27:31 -06:00
..
ajax.server.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
browse.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
democratic.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
flag.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
index.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
localplay.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
playlist.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
random.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
song.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
stats.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
stream.ajax.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
tag.ajax.php Merge branch 'master' of https://github.com/ampache-doped/ampache 2013-11-19 19:27:31 -06:00
xml.server.php Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00