Merge remote-tracking branch 'origin/master' into citadel

Conflicts: config.py
2016-07-16 21:45:28 -04:00
parent 7b2a89d66b 23a6849fe3
commit faed0ce159
18 changed files with 54 additions and 13 deletions
--- a/service/market.py
+++ b/service/market.py
@@ -762,7 +762,7 @@ class Market():
        def cb():
            try:
                callback(requests)
-            except:
+            except Exception, e:
                pass
            eos.db.commit()