Merged conflicts.

This commit is contained in:
Griatch 2015-10-19 23:32:00 +02:00
parent 48f1d0b26f
commit 50371b6abd
23 changed files with 39 additions and 39 deletions

View file

@ -126,7 +126,7 @@ class HelpEntryManager(models.Manager):
topic.help_category = default_category
topic.save()
string = "Help database moved to category %s" % default_category
logger.log_infomsg(string)
logger.log_info(string)
def search_help(self, ostring, help_category=None):
"""