Skip to content

Commit

Permalink
Rev1704, FIx siteSign error
Browse files Browse the repository at this point in the history
  • Loading branch information
shortcutme committed Nov 11, 2016
1 parent 43e9044 commit c82c61e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions plugins/MergerSite/MergerSitePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ def updateMergerSites(self):
merged_db = {}
merged_to_merger = {}
site_manager = self
if not self.sites:
return
for site in self.sites.itervalues():
# Update merged sites
merged_type = site.content_manager.contents.get("content.json", {}).get("merged_type")
Expand Down
2 changes: 1 addition & 1 deletion src/Config.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class Config(object):

def __init__(self, argv):
self.version = "0.5.0"
self.rev = 1703
self.rev = 1704
self.argv = argv
self.action = None
self.config_file = "zeronet.conf"
Expand Down

0 comments on commit c82c61e

Please sign in to comment.