1
0
mirror of https://github.com/spl0k/supysonic.git synced 2024-11-14 14:12:17 +00:00
supysonic/api
Emory P fd4c9b9ac9 Merge remote-tracking branch 'upstream/master'
Conflicts:
	api/__init__.py
	api/browse.py
	api/media.py
	cli.py
	db.py
	main.py
	main.wsgi
	scanner.py
	web.py
2014-03-12 14:06:43 -04:00
..
__init__.py Merge remote-tracking branch 'upstream/master' 2014-03-12 14:06:43 -04:00
albums_songs.py Merge remote-tracking branch 'upstream/master' 2014-03-12 14:06:43 -04:00
annotation.py Reworked imports 2014-03-04 22:56:53 +01:00
browse.py Merge remote-tracking branch 'upstream/master' 2014-03-12 14:06:43 -04:00
chat.py Setting a license 2014-03-02 18:31:32 +01:00
media.py Merge remote-tracking branch 'upstream/master' 2014-03-12 14:06:43 -04:00
playlists.py Setting a license 2014-03-02 18:31:32 +01:00
search.py Merge remote-tracking branch 'upstream/master' 2014-03-12 14:06:43 -04:00
system.py Setting a license 2014-03-02 18:31:32 +01:00
user.py Setting a license 2014-03-02 18:31:32 +01:00