Merge branch 'refs/heads/develop' into nosql

Conflicts: couchpotato/core/media/__init__.py couchpotato/core/notifications/trakt/main.py
2014-02-16 15:56:18 +01:00
parent 1f982b7999 8b747dff9b
commit 6437079be3
25 changed files with 877 additions and 482 deletions
@@ -215,6 +215,7 @@ class Settings(object):

        # After save (for re-interval etc)
        fireEvent('setting.save.%s.%s.after' % (section, option), single = True)
+        fireEvent('setting.save.%s.*.after' % section, single = True)

        return {
            'success': True,