1
0
mirror of https://github.com/spl0k/supysonic.git synced 2024-11-14 22:22:18 +00:00
supysonic/managers
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 Setting a license 2014-03-02 18:31:32 +01:00
folder.py Merge remote-tracking branch 'upstream/master' 2014-03-12 14:06:43 -04:00
user.py Setting a license 2014-03-02 18:31:32 +01:00