Merge remote-tracking branch 'jelmer/hashbang'

2024-12-23 01:16:18 +00:00 · 2014-02-23 22:36:20 +01:00 · 2014-02-23 22:36:20 +01:00 · 692f7d86e3
commit 692f7d86e3
parent 39b3a3ce49 24b39c4565
24 changed files with 2 additions and 0 deletions
--- a/README.md
+++ b/README.md
--- a/api/init.py
+++ b/api/init.py
--- a/api/albums_songs.py
+++ b/api/albums_songs.py
--- a/api/annotation.py
+++ b/api/annotation.py
--- a/api/browse.py
+++ b/api/browse.py
--- a/api/chat.py
+++ b/api/chat.py
--- a/api/media.py
+++ b/api/media.py
--- a/api/playlists.py
+++ b/api/playlists.py
--- a/api/search.py
+++ b/api/search.py
--- a/api/system.py
+++ b/api/system.py
--- a/api/user.py
+++ b/api/user.py
--- a/cli.py
+++ b/cli.py
@ -1,3 +1,4 @@
 #!/usr/bin/python
 # coding: utf-8
 import sys, cmd, argparse, getpass, time
--- a/config.py
+++ b/config.py
--- a/db.py
+++ b/db.py
--- a/folder.py
+++ b/folder.py
--- a/lastfm.py
+++ b/lastfm.py
--- a/main.py
+++ b/main.py
@ -1,3 +1,4 @@
 #!/usr/bin/python
 # coding: utf-8
 import config
--- a/main.wsgi
+++ b/main.wsgi
--- a/managers/folder.py
+++ b/managers/folder.py
--- a/managers/user.py
+++ b/managers/user.py
--- a/playlist.py
+++ b/playlist.py
--- a/scanner.py
+++ b/scanner.py
--- a/user.py
+++ b/user.py
--- a/web.py
+++ b/web.py